l10n daemon script
|
f40762a220
|
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"
|
2019-07-27 05:10:32 +02:00 |
|
l10n daemon script
|
e8d6f7bab6
|
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"
|
2019-03-05 05:54:54 +01:00 |
|
l10n daemon script
|
8139d5c295
|
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"
|
2019-02-25 05:46:38 +01:00 |
|
l10n daemon script
|
7b93571787
|
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"
|
2019-02-24 05:28:36 +01:00 |
|
l10n daemon script
|
77add45499
|
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"
|
2019-01-12 05:28:24 +01:00 |
|
l10n daemon script
|
66ded3229d
|
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"
|
2019-01-01 05:26:53 +01:00 |
|
l10n daemon script
|
8d980b56ed
|
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-12-19 05:44:22 +01:00 |
|
l10n daemon script
|
9ca63ab501
|
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-10-24 05:56:19 +02:00 |
|
l10n daemon script
|
cbaf62427f
|
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-08-18 05:42:22 +02:00 |
|
l10n daemon script
|
c9258f74c0
|
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-08-05 05:29:30 +02:00 |
|
l10n daemon script
|
67e943713b
|
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-08-03 05:37:12 +02:00 |
|
l10n daemon script
|
0201171956
|
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-07-31 05:43:22 +02:00 |
|
l10n daemon script
|
79a6f5a192
|
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-07-15 05:17:11 +02:00 |
|
l10n daemon script
|
11954f1185
|
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-06-16 05:31:52 +02:00 |
|
l10n daemon script
|
7497d509f4
|
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-06-07 05:41:48 +02:00 |
|
l10n daemon script
|
b3a8a3874f
|
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-04-23 05:26:25 +02:00 |
|
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
|
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
|
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 |