l10n daemon script
|
01ed1d84b9
|
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"
|
8 years ago |
l10n daemon script
|
6ff10e4405
|
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"
|
8 years ago |
l10n daemon script
|
da99315b17
|
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"
|
8 years ago |
l10n daemon script
|
aa0a25f380
|
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"
|
9 years ago |
l10n daemon script
|
5a7d6d3df9
|
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"
|
9 years ago |
l10n daemon script
|
26ca314687
|
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"
|
9 years ago |
l10n daemon script
|
b160c5babb
|
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"
|
9 years ago |
l10n daemon script
|
8725f2441e
|
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"
|
9 years ago |
l10n daemon script
|
d886ea9004
|
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"
|
9 years ago |
l10n daemon script
|
1296cfd861
|
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"
|
9 years ago |
l10n daemon script
|
13d389efd1
|
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"
|
9 years ago |
l10n daemon script
|
0990566c63
|
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"
|
10 years ago |
l10n daemon script
|
57649ee854
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
l10n daemon script
|
58e2bca56d
|
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"
|
10 years ago |
l10n daemon script
|
bd3083e81f
|
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"
|
10 years ago |
l10n daemon script
|
096b61ee44
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
l10n daemon script
|
aa0f2c88f0
|
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"
|
10 years ago |
l10n daemon script
|
02e9001f39
|
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"
|
10 years ago |
l10n daemon script
|
9356fb52fb
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
l10n daemon script
|
c6aafe23de
|
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"
|
10 years ago |
l10n daemon script
|
42c594330a
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
c342be5961
|
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"
|
11 years ago |
l10n daemon script
|
262da1b7c9
|
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"
|
11 years ago |
l10n daemon script
|
795ebbb879
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
e178851846
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
dbdcb9938c
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
91ff859d5f
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
493e9b3238
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
28c7f3c47d
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
e73f6b2278
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
7553c411c2
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
2f28437e24
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
2838a9b606
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
15aa971aab
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
e1f418f4d0
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
f44575ddbf
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
69c3289c18
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
e6db000065
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
eef56c98b2
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
fab5def5e9
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
6f8c3dd771
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
588ad2be66
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
22a5e1109f
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
7cd29623ea
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
51b677e1ab
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
4abba66bf0
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
551988ebd4
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
ad3449f3b1
|
SVN_SILENT made messages (.desktop file)
|
13 years ago |
l10n daemon script
|
23fbf4395f
|
SVN_SILENT made messages (.desktop file)
|
13 years ago |
l10n daemon script
|
24f68febf1
|
SVN_SILENT made messages (.desktop file)
|
13 years ago |