Christoph Cullmann
|
377a33ee8b
|
Don't require dbus + bundle ui files in resources
REVIEW: 128168
|
10 years ago |
l10n daemon script
|
178736b6ab
|
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
|
2e0af44a1f
|
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
|
8a5524172a
|
SVN_SILENT made messages (after extraction)
|
10 years ago |
|
l10n daemon script
|
63ca7a52be
|
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
|
6c4608b703
|
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
|
fc674750e5
|
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
|
9a5ded6a96
|
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
|
0cb6bffaf2
|
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
|
0f11390eb7
|
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
|
0756393b43
|
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 |
Kurt Hindenburg
|
ae811d1cb3
|
Add missing ; for Actions
|
10 years ago |
|
l10n daemon script
|
5075f16fdb
|
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
|
71ef54b2bd
|
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
|
b9d16c7c42
|
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
|
2953e8dba8
|
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
|
611f185c26
|
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 |
|
Kurt Hindenburg
|
c595d0cd86
|
Add 'Comment' lines to desktop files
I simpflied the text for most of these from the reviewboard patch
REVIEW:125943
BUG: 351960
|
10 years ago |
|
Kurt Hindenburg
|
0f21667497
|
Add Comment and new action NewTab
|
10 years ago |
|
l10n daemon script
|
da573a8a90
|
SVN_SILENT made messages (after extraction)
|
10 years ago |
Jonathan Riddell
|
2b895fb7f3
|
use sound from Oxygen theme instead of from kde-runtime
|
10 years ago |
|
l10n daemon script
|
95998b62ce
|
SVN_SILENT made messages (after extraction)
|
10 years ago |
|
l10n daemon script
|
9490873ade
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
|
l10n daemon script
|
0deeb8bc99
|
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
|
cf92517959
|
SVN_SILENT made messages (after extraction)
|
10 years ago |
|
l10n daemon script
|
25c35f2c78
|
SVN_SILENT made messages (after extraction)
|
10 years ago |
|
l10n daemon script
|
8858ba30b4
|
SVN_SILENT made messages (after extraction)
|
10 years ago |
|
l10n daemon script
|
d619241f84
|
SVN_SILENT made messages (after extraction)
|
10 years ago |
|
l10n daemon script
|
7fd931601e
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
4cbb5adced
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
2f8f73b3d3
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
176f0d5141
|
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
|
d9d24d6df1
|
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
|
b427c61608
|
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
|
d8108ae96e
|
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
|
79a9103f3c
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
a2751f1df4
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
65e64ca6f6
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
240a1e5c7f
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
6f60a9117d
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
01cedb224c
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
d09491dec3
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
d5aab503b4
|
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
|
976d5c621d
|
Use StartupNotify
|
11 years ago |
|
l10n daemon script
|
9f8d393394
|
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
|
5dcb59acea
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
b4ccd90fcd
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
c32efee437
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
609118096f
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
|
l10n daemon script
|
394d1e88b0
|
SVN_SILENT made messages (after extraction)
|
11 years ago |
