l10n daemon script
|
3fa06267e8
|
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"
|
5 years ago |
|
l10n daemon script
|
ff9f6c8c10
|
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"
|
5 years ago |
|
l10n daemon script
|
2aecf659a6
|
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
|
5f13bcabf9
|
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 |
Friedrich W. H. Kossebau
|
3c41e2c12f
|
runners: port to new KRunner metadata system & install location
|
6 years ago |
|
l10n daemon script
|
98397d7fd1
|
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
|
8fda734647
|
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
|
fe7320494b
|
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
|
fd832ae350
|
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
|
70ad54479f
|
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
|
6236df5138
|
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
|
f04038a367
|
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
|
d0cb0bd49f
|
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
|
b547a75572
|
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
|
d6821b3d2e
|
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
|
438ec77eec
|
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
|
bd2b9284ea
|
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
|
eecef65e5e
|
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
|
df0254c789
|
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
|
a13711385d
|
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
|
7eb512cd58
|
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
|
f1bfb665bd
|
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
|
bfc268091e
|
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
|
dbc616f0fd
|
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
|
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
|
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
|
a465ca396d
|
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
|
3949d990a4
|
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
|
522b1993e6
|
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
|
7c72e7a6c9
|
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
|
d5a7ad93fb
|
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
|
66f97694fc
|
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
|
608648aa05
|
SVN_SILENT made messages (.desktop file)
|
10 years ago |
|
l10n daemon script
|
3973041666
|
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
|
738b59196a
|
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
|
fb88c728e1
|
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
|
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
|
6ef6c7e692
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
cf13f672b0
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
f6fa9c9cd7
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
7340ee7972
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
02b92c46d5
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
55744e1106
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
|
l10n daemon script
|
bc51c4f2b0
|
SVN_SILENT made messages (.desktop file)
|
12 years ago |
