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
|
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 |
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 |
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
|
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
|
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 |
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
|
ea124ec89a
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
1c75c1884f
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
4739abf934
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
c24c0b3f0e
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
c1988406ab
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
0027a604b8
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
c19effafc5
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
c31ec2b956
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
dc2e9cf76e
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
37f9db9739
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
d9091d109f
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
cf2d0bfd3e
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
32db3642fb
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
e2aaef4412
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
bb1efb93c6
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
65137db652
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
bbc643b6ff
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
a5af7b0f44
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
88a56d8950
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
ce217deb81
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
4604038566
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
69f33c75db
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
13429e2730
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
Kurt Hindenburg
|
dd1b68eb73
|
Add a 'Run in Konsole' action .desktop
This adds a 'Run in Konsole' action in dolphin/konq/etc.
REVIEW: 107086
(cherry picked from commit 8287066eb5)
|
12 years ago |
l10n daemon script
|
d365ef5518
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
57dad77b6a
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
l10n daemon script
|
7515e0a592
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
Kurt Hindenburg
|
8287066eb5
|
Add a 'Run in Konsole' action .desktop
This adds a 'Run in Konsole' action in dolphin/konq/etc.
REVIEW: 107086
|
12 years ago |