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
|
818ed8f4ad
|
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
|
c855555903
|
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
|
b2bed00c82
|
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
|
7edab3f5fb
|
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
|
c240755dee
|
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
|
8b1a5f27df
|
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
|
6bb9f6db7b
|
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
|
56860e63f5
|
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
|
3433b05c97
|
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
|
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
|
d07fd3a140
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
99237c9b3f
|
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
|
64841a2434
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
01b61a9ede
|
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
|
9361fb8610
|
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
|
777dc69831
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
a59a89d36c
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
a14e62dadc
|
SVN_SILENT made messages (.desktop file)
|
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
|
56b830202e
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
2734f709ad
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
bf7bf73464
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
d173ff7412
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
8629054181
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
ccc7e52dc9
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
a010bbc6a7
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
7d9831d8b4
|
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
|
857610668e
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
08540b45eb
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
65548b0df3
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
1205c9c170
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
9af9814859
|
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
|
5114d9b5da
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
6314d643c8
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
f2fc577770
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
3acff8e9bc
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
1478a08c31
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
2fccd37905
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
2c78ff8bfd
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
5179d4d3c9
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |