l10n daemon script
|
ee162ffddb
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
l10n daemon script
|
119bb0ecd2
|
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
|
a8cdfcb0d3
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
l10n daemon script
|
57c5cbfde0
|
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
|
1df2d478a9
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
l10n daemon script
|
b4ffc41bd0
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
l10n daemon script
|
a2fd918ad9
|
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
|
2fee136339
|
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
|
9c7a558b8c
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
l10n daemon script
|
16f0780688
|
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
|
9a5c82a411
|
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
|
98ac941316
|
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
|
8c141cc2fc
|
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
|
cd34059f53
|
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
|
7b8f0a7459
|
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
|
22ba4596fa
|
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
|
558b4bb765
|
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
|
dde68921b6
|
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
|
f6d4b45650
|
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
|
2669a2f354
|
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
|
2b1cf29728
|
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
|
6a2b5fc7b8
|
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
|
79fa933c73
|
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
|
ef99f17efb
|
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
|
8703484e63
|
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
|
7be388fa0f
|
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 |
Albert Astals Cid
|
ab8944dcce
|
Add Comment
BUGS: 351973
|
11 years ago |
l10n daemon script
|
9a3672b255
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
l10n daemon script
|
e6ef3cb64b
|
SVN_SILENT made messages (.desktop file)
|
11 years ago |
Jeremy Whiting
|
83299b9532
|
Remove %i from .desktop files which added --icon to exec line.
Since Okular no longer uses KApplication it no longer handles --icon parameters.
|
12 years ago |
l10n daemon script
|
3588634833
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
8365cf2873
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
Frederik Gladhorn
|
f7d1dd9312
|
Remove -caption %c from .desktop files
BUGS: 338264
|
12 years ago |
l10n daemon script
|
896de56ef0
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
1b5cbbea59
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
d2131617d6
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
6a46dd7447
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
c1859fd649
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
0efb152065
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
7b4f684522
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
02c782f7e4
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
8068e5b502
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
5facfef408
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
355997d377
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
6e529dd214
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
cad1e895d2
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
4a97dc56e6
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
6b07409b91
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
514ef4a3ac
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
6f62e29846
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |