l10n daemon script
|
823442d2ab
|
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
|
77529c1842
|
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
|
592df93013
|
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
|
0d1c0e8b9e
|
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
|
703f837f6b
|
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
|
d2737d2b55
|
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
|
a4d78566ec
|
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
|
7ed3fba434
|
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
|
afa0796744
|
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 |
Friedrich W. H. Kossebau
|
1894d888f7
|
Remove unused entry X-KDE-DBus-ModuleName from kded plugins' metadata
That entry has never been used, instead the plugin id (as by
KPluginMetaData::pluginId()) has been used for the module name in the
D-Bus object path.
|
8 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
|
f5546cb5e6
|
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
|
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
|
c937f440b1
|
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
|
1ea9490105
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
l10n daemon script
|
272bc46d63
|
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
|
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
|
a54f4802de
|
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
|
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
|
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
|
683c131e75
|
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
|
92f9c24988
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
ebd5d8f98e
|
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
|
344a005f12
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
0bd88bd91a
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |