l10n daemon script
|
b83af07d0c
|
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"
|
6 years ago |
l10n daemon script
|
db54291a8f
|
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"
|
6 years ago |
l10n daemon script
|
909f9145e7
|
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"
|
7 years ago |
l10n daemon script
|
de4197e6ee
|
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"
|
7 years ago |
l10n daemon script
|
fc5bff8db6
|
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"
|
7 years ago |
l10n daemon script
|
4dfc454d51
|
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"
|
7 years ago |
l10n daemon script
|
92a6d3f3a3
|
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"
|
7 years ago |
Laurent Montel
|
ce04cdc185
|
Fix url
|
7 years ago |
l10n daemon script
|
6816ccdb48
|
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
|
887d225c17
|
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
|
4332eceebf
|
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
|
b0d12d435f
|
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
|
d389cde75f
|
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
|
6ea0292868
|
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 |
Jonathan Riddell
|
b0e8b75b85
|
Fix SPDX syntax http://metadata.neon.kde.org/appstream/html/xenial/main/issues/plasma-workspace.html
|
9 years ago |
l10n daemon script
|
49d79637c5
|
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
|
f1167336c1
|
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
|
60eb1564da
|
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
|
50b7c832f3
|
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
|
eed497cef4
|
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
|
73f5302679
|
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
|
3453aa8aa0
|
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
|
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
|
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
|
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
|
640f47fdd2
|
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
|
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
|
16778ed168
|
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
|
51f2849197
|
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
|
651c6e5841
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
683c131e75
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |