l10n daemon script
|
f9893549ba
|
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
|
5435e568df
|
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
|
278ba70509
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
l10n daemon script
|
b2173723ce
|
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
|
10856b8411
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
l10n daemon script
|
8e5a578302
|
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
|
29e7eaf0be
|
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
|
0e35c812b0
|
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
|
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
|
38095521cc
|
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
|
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
|
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
|
2167d84c03
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
cd028e0f09
|
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
|
738b59196a
|
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
|
fb88c728e1
|
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 |
Montel Laurent
|
5f9ae5e13c
|
We depend against kf5-5.8 => ecm > 1.6 => we can use new KDE_ variable
|
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
|
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
|
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
|
553bfe129e
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
e0555d9ef1
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
352e87eec9
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
2f911ca9a3
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
8d64abb2fa
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
7fa10ab427
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
68f45dcc1c
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
5d01f955db
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
b4d7c387c7
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
700ffb1dc8
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
53549eb063
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
7d59e21df3
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
ae30b993c4
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
697651faa6
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
5386b47a87
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
f516e0b07e
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
6ef6c7e692
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
d0c3845cb2
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
e558bc76b9
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
Jonathan Riddell
|
53eccfad47
|
REVIEW:118724
rename .directory files to kf5 prefix to prevent clashes with kde-runtime files
|
12 years ago |
l10n daemon script
|
31ad166b6b
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
8288a89911
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
8be9712437
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |