l10n daemon script
50c2cebdd6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
6 years ago
l10n daemon script
3953f3e0bf
GIT_SILENT made messages (after extraction)
6 years ago
Luigi Toscano
f1b7661b1f
Update a few internal KDE URLs
...
Use the generic redirect commits.kde.org insteaf of:
- projects.kde.org, which has been obsolete for a while;
- cgit.kde.org, which is not a future-proof URL anyway.
6 years ago
Albert Astals Cid
29f96b7504
Fix lupdate warnings
...
Summary:
Class 'XXX' lacks Q_OBJECT macro
If you use tr() in a class it needs Q_OBJECT
Test Plan: It builds
Reviewers: drosca
Reviewed By: drosca
Subscribers: falkon
Tags: #falkon
Differential Revision: https://phabricator.kde.org/D25911
6 years ago
David Rosca
bfb9420cbb
PyFalkon: Fix C linkage issues
...
BUG: 413093
FIXED-IN: 3.1.1
6 years ago
l10n daemon script
1363b848a5
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
74e55c59d3
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
8b4d2556a0
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
821b1c6f81
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
1162a5cf20
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
026320183c
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
677380520c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
Pino Toscano
070bce531c
i18n: use https for bugs.kde.org
7 years ago
l10n daemon script
6ae5f0e9e5
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
3fdd1d95d3
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
483f5f70b5
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
24434a05a7
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
eb3e966363
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
44c85c7f65
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
cc248c72c8
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
David Rosca
3075477492
IconProvider: Add mutex around icon cache
...
BUG: 406972
FIXED-IN: 3.1.1
7 years ago
l10n daemon script
8e57d0895c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
01f3c3d376
GIT_SILENT made messages (after extraction)
7 years ago
l10n daemon script
8393f62ad4
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
5614a32d5c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
0d5e79a8a9
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
05b63efb59
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
David Rosca
f38265230d
SideBarManager: Clear active sidebar upon close
...
BUG: 406724
FIXED-IN: 3.1.1
7 years ago
David Rosca
92721449c0
VerticalTabs: Also override Ctrl+PgUp/PgDown shortcuts
7 years ago
David Rosca
514097ef4c
BookmarksManager: Don't allow to create bookmark without parent
...
BUG: 406433
FIXED-IN: 3.1.1
7 years ago
David Rosca
8e4328b03c
QmlUserScript: Automatically install/uninstall underlying script
7 years ago
David Rosca
a8d43ed0c8
QmlStaticData: Prevent deleting singletons by QML engine
7 years ago
David Rosca
231101151e
QmlPluginLoader: Fallback to main.qml as entrypoint if not set
7 years ago
David Rosca
10eb20c162
QmlExtensionScheme: Fix warning about QQmlParserStatus qobject_cast
7 years ago
David Rosca
eb4b68fdd9
MainApplication: Create private browsing QWebEngineProfile without parent
...
Fixes crash on shutdown
7 years ago
l10n daemon script
c5e1aab96a
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
David Rosca
232eaa54bd
KDEFrameworksIntegration: Create Purpose menu in init
7 years ago
l10n daemon script
6e98af2f1c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
61f3cd89a1
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
f322c4ed94
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
4c2b453573
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
95661276c5
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
2a7176946b
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
739f0d20d6
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
David Rosca
479933e095
PyFalkon: Fix build with Qt 5.12.2
...
BUG: 405833
FIXED-IN: 3.1.1
7 years ago
l10n daemon script
2743002b2d
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
dc140a7053
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
l10n daemon script
f712500b2c
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago
David Rosca
63aa4028a4
SearchToolBar: Remove warning message that no results were found
7 years ago
l10n daemon script
d729117adb
SVN_SILENT made messages (.desktop file) - always resolve ours
...
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
7 years ago