l10n daemon script
|
1f3a932c5e
|
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"
|
4 years ago |
Laurent Montel
|
640242a4ff
|
const'ify + fix clazy warnings
|
4 years ago |
|
Laurent Montel
|
c2c3a2d6b7
|
Install in kf<version>
|
4 years ago |
|
l10n daemon script
|
fcb522f815
|
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"
|
4 years ago |
|
l10n daemon script
|
a7588366e6
|
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"
|
4 years ago |
|
l10n daemon script
|
4d532f0801
|
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"
|
4 years ago |
|
l10n daemon script
|
daed0461eb
|
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"
|
4 years ago |
|
l10n daemon script
|
2141988c3b
|
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"
|
4 years ago |
|
l10n daemon script
|
6721c2ec92
|
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"
|
4 years ago |
|
l10n daemon script
|
1c12775ec7
|
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"
|
4 years ago |
|
l10n daemon script
|
0d0b713076
|
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"
|
4 years ago |
|
l10n daemon script
|
5259ac39ab
|
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"
|
4 years ago |
|
l10n daemon script
|
594b933a1e
|
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"
|
4 years ago |
|
l10n daemon script
|
5a792e989f
|
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"
|
4 years ago |
Alexander Lohnau
|
7f3e6e2fd7
|
GIT_SILENT Remove no longer needed desktop file
|
4 years ago |
|
Alexander Lohnau
|
ff19a1c343
|
Remove unneeded ServiceType definitions in json metadata
We already do the filtering based on the plugin namespace and no
longer through the SevriceTyoes.
|
4 years ago |
|
l10n daemon script
|
7ebe49f96f
|
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"
|
4 years ago |
|
l10n daemon script
|
41e9c0e65f
|
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"
|
4 years ago |
|
l10n daemon script
|
b64be79def
|
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"
|
4 years ago |
|
l10n daemon script
|
07e7431c2a
|
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"
|
4 years ago |
|
l10n daemon script
|
c7689f5349
|
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"
|
4 years ago |
|
l10n daemon script
|
36cadc2c69
|
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"
|
4 years ago |
|
Laurent Montel
|
2543f1b843
|
GIT_SILENT: use Q_EMIT
|
4 years ago |
|
l10n daemon script
|
50a7069ada
|
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"
|
4 years ago |
|
Alexander Lohnau
|
6d3b831cdb
|
Remove now unneeded desktop to json conversion code
|
4 years ago |
|
Alexander Lohnau
|
5e8b5a41d1
|
Convert desktop files to JSON
Task: https://phabricator.kde.org/T14564
|
4 years ago |
|
l10n daemon script
|
55000bfbca
|
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"
|
5 years ago |
|
l10n daemon script
|
b9a1e98742
|
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"
|
5 years ago |
|
Alexander Lohnau
|
c11051955d
|
Convert license headers to SPDX
|
5 years ago |
Adrien Faveraux
|
42515d22cb
|
Move include guard to Pragma Once
|
5 years ago |
|
l10n daemon script
|
9cffc2cf0a
|
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"
|
5 years ago |
|
Alexander Lohnau
|
3d03606302
|
Use kcoreaddons_add_plugin to allow loading plugins from build dir
Task: https://phabricator.kde.org/T14528
|
5 years ago |
Nicolas Fella
|
178a4f8756
|
Use version-less qt DBus macros
They work with both Qt5 and Qt6
|
5 years ago |
|
l10n daemon script
|
7fb5605b5d
|
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"
|
5 years ago |
|
Nicolas Fella
|
a15b0abf3a
|
Remove redundant QT_NO_URL_CAST_FROM_STRING definitions
The definition is added in the root CMake file, no need to add it
multiple times
|
5 years ago |
|
Nicolas Fella
|
1a07220843
|
Use versionless Qt cmake target
This makes it easier to build against both Qt5 and Qt6
|
5 years ago |
|
Alexander Lohnau
|
823d2106ec
|
Run clang-format
If you want git blame to ignore formatting revisions run:
git config blame.ignoreRevsFile .git-blame-ignore-revs
|
5 years ago |
|
Alexander Lohnau
|
6c4d16eeee
|
Fix includes in case they get reordered
When running clang-format these includes will get reordered
and the build will fail. This commit prevents this from happening.
|
5 years ago |
|
l10n daemon script
|
2aecf659a6
|
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
|
5f13bcabf9
|
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
|
98397d7fd1
|
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
|
8fda734647
|
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
|
fe7320494b
|
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
|
fd832ae350
|
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
|
70ad54479f
|
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
|
6236df5138
|
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
|
f04038a367
|
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
|
d0cb0bd49f
|
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
|
b547a75572
|
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 |
David Faure
|
ca8e92a560
|
Remove too strict Qt/KF5 deprecation rule. GIT_SILENT
|
6 years ago |
