l10n daemon script
|
e44e4a4c19
|
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"
|
2020-06-20 05:10:40 +02:00 |
|
l10n daemon script
|
653a708727
|
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"
|
2020-06-18 05:39:20 +02:00 |
|
l10n daemon script
|
e873eddcde
|
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"
|
2020-06-17 14:06:59 +02:00 |
|
l10n daemon script
|
0e04769a43
|
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"
|
2020-04-07 06:11:40 +02:00 |
|
Nicolas Fella
|
9f1101c9c1
|
Use kdeconnect-settings for command configuration
Instead of relying on kde-cli-tools being installed.
|
2020-03-21 21:26:51 +01:00 |
|
l10n daemon script
|
87d58643a2
|
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"
|
2020-03-17 10:05:04 +01:00 |
|
l10n daemon script
|
201be5d898
|
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"
|
2020-03-16 10:21:09 +01:00 |
|
l10n daemon script
|
916ec3a405
|
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"
|
2020-01-17 06:12:24 +01:00 |
|
Nicolas Fella
|
1a2315cdf7
|
Move settings app into own folder and make it a KDBusService
|
2020-01-17 01:32:56 +01:00 |
|