l10n daemon script
|
e57fd79f26
|
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-09-19 06:10:24 +02:00 |
|
l10n daemon script
|
b7bdc75ff9
|
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-09-17 06:15:05 +02:00 |
|
l10n daemon script
|
90a3ded076
|
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-08-09 05:37:05 +02:00 |
|
l10n daemon script
|
10de7b3763
|
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-07-23 09:50:37 +02:00 |
|
l10n daemon script
|
0c32010a28
|
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-07-06 05:30:08 +02:00 |
|
Nicolas Fella
|
c8a87db367
|
Merge branch 'release/20.04'
|
2020-07-05 15:49:58 +02:00 |
|
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
|
373557cd26
|
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 08:27:38 +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
|
5fe8d7ea90
|
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 16:50:11 +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
|
046a572542
|
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-07 08:58:38 +02:00 |
|
l10n daemon script
|
1634126eb5
|
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 10:16:35 +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 |
|
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 |
|