l10n daemon script
|
8e609daaca
|
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
|
fbb64207eb
|
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
|
7b692d6aa6
|
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
|
95068eb6c9
|
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
|
52276c9874
|
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
|
c56a99a0bb
|
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
|
0848ba2125
|
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
|
640cd297d1
|
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
|
04e25ce4f6
|
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
|
6b947b6018
|
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
|
181199ccbb
|
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
|
a0a4320c6c
|
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
|
393a8e1561
|
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
|
8556ed8858
|
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
|
96915c3248
|
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
|
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 |
Aleix Pol
|
5291c77465
|
SystemDialog: Move the different implementations into a LnF file
This way a LookAndFeel package can override the dialog and trim it to
its needs.
|
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 |
|
Alexander Lohnau
|
e1856783c3
|
Remove now unneeded desktop files
Also the install code for some plugins that are already ported to json metadata
|
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
|
f258b6217a
|
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
|
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
|
21c98b356f
|
GIT_SILENT Make sure to use QString default value when reading KPluginMetaData value
|
5 years ago |
|
Alexander Lohnau
|
c11051955d
|
Convert license headers to SPDX
|
5 years ago |
|
Alexander Lohnau
|
8de79169f8
|
Consistently name kpackage structures
This will allow kpackage to load the structures by their path.
Task: https://phabricator.kde.org/T14757
Conceptually the same direction as https://phabricator.kde.org/T14499.
|
5 years ago |
|
Alexander Lohnau
|
50c2fc495c
|
Define new KPackageStructure property in kpackage structures
Task: https://phabricator.kde.org/T14563
|
5 years ago |
Adrien Faveraux
|
42515d22cb
|
Move include guard to Pragma Once
|
5 years ago |
|
l10n daemon script
|
b79988ff0e
|
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
|
faad339db5
|
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
|
96355cd03a
|
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
|
b640fbdc3e
|
kpackage structures: Use K_PLUGIN_CLASS_WITH_JSON directly
Task: https://phabricator.kde.org/T14542
|
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 |
|
l10n daemon script
|
9f02b43f3f
|
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
|
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 |
|
l10n daemon script
|
915c13185d
|
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
|
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 |
|
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
|
551f41f03f
|
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
|
80bc5112fd
|
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 |
