l10n daemon script
|
40f0461650
|
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
|
d102933e7e
|
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
|
ed0ce07ac5
|
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
|
80c1c7eada
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
d3277e8269
|
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
|
0110ed2c01
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
7cc28b39b4
|
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
|
ef8e9abb33
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
6635cdc956
|
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
|
06fef334cb
|
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
|
b64118ab04
|
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
|
a27a6ebdab
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
6f60f5d2e3
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
4207c67625
|
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
|
4dbb05ac96
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
0cd67e377b
|
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
|
59292eea40
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
1f37ac1fa2
|
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
|
059c83da94
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
2eaecc21f2
|
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
|
4764dc57b7
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
f6a426697f
|
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
|
9daafd8c07
|
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
|
f8e40f16c2
|
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
|
2a343abdc4
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
3a65e7f46b
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
640f47fdd2
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
0833c9bdfc
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
b6da017493
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
2569d35ff4
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
5e058803f7
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
e8dd62f1c1
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
8e3c188f58
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
99bd87a5ad
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
5629da4cb1
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
17afa5aeb1
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
ebb30d9118
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
310bb9ef7c
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
02be92506c
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
39879ea0bb
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
6b458cad48
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
96a84be147
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
765e6a3c0a
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
6dc8fb75ce
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
abb6dd177d
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
c8371e44c1
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
484ea4b6ee
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
ec25b34ade
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
9f71e7eede
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
8161b10737
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |