l10n daemon script
|
5a52a2e603
|
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-08 07:40:00 +02:00 |
|
l10n daemon script
|
0a744919e5
|
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-03 07:10:33 +02:00 |
|
l10n daemon script
|
3bc9e66596
|
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-26 07:19:13 +02:00 |
|
l10n daemon script
|
683a3d0bf9
|
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-22 07:04:43 +02:00 |
|
l10n daemon script
|
cd15b7008c
|
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-06 07:29:50 +02:00 |
|
l10n daemon script
|
f1fdfa57ab
|
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-02 07:40:51 +02:00 |
|
l10n daemon script
|
277003fa1d
|
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-05-16 07:34:51 +02:00 |
|
l10n daemon script
|
7689b73daa
|
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-05-02 07:39:45 +02:00 |
|
l10n daemon script
|
75d5f5d552
|
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-21 07:16:56 +02:00 |
|
l10n daemon script
|
d1ab287dc0
|
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-15 07:11:07 +02:00 |
|
l10n daemon script
|
63f5fdd3d7
|
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-11 06:59:04 +02:00 |
|
l10n daemon script
|
e0f390e986
|
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-07 07:11:21 +02:00 |
|
l10n daemon script
|
b4eaa10c10
|
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-02-19 05:02:21 +01:00 |
|
l10n daemon script
|
00f337b82c
|
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-02-18 04:59:49 +01:00 |
|
l10n daemon script
|
dd3c570c41
|
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-02-17 05:04:26 +01:00 |
|
l10n daemon script
|
adf24d7f94
|
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-02-14 04:57:58 +01:00 |
|
l10n daemon script
|
3de958a3ed
|
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-02-13 05:17:37 +01:00 |
|
David Rosca
|
9db6745ee5
|
Port theme metadata to standard desktop file
This makes it possible to translate it.
|
2018-02-11 11:42:37 +01:00 |
|