l10n daemon script
|
2f621fc6db
|
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"
|
2018-03-13 05:16:54 +01:00 |
|
l10n daemon script
|
4406297053
|
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"
|
2018-03-12 04:59:29 +01:00 |
|
l10n daemon script
|
f89bc39c76
|
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"
|
2018-03-11 05:21:27 +01:00 |
|
l10n daemon script
|
11d2bbc344
|
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"
|
2018-03-06 05:21:11 +01:00 |
|
l10n daemon script
|
07a0f47c57
|
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"
|
2018-03-05 05:14:10 +01:00 |
|
l10n daemon script
|
67b25dc0e9
|
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"
|
2018-03-04 05:17:01 +01:00 |
|
l10n daemon script
|
fe117a20b0
|
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"
|
2018-03-03 05:26:15 +01:00 |
 Andrius Štikonas
|
144e260efe
|
Finish porting to KCoreAddons JSON plugins.
Convert .desktop files to .json with desktoptojson
|
2018-03-02 11:33:46 +00:00 |