summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorl10n daemon script <scripty@kde.org>2015-04-03 04:40:59 +0000
committerl10n daemon script <scripty@kde.org>2015-04-03 04:40:59 +0000
commit9af0b91fadd6517e48b34bafeb1ce5459ef0369b (patch)
tree42cf1cccdfab1b818466bed389bb784deed5db65 /src
parentSVN_SILENT made messages (.desktop file) - always resolve ours (diff)
downloadrekonq-9af0b91fadd6517e48b34bafeb1ce5459ef0369b.tar.xz
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"
Diffstat (limited to 'src')
-rwxr-xr-xsrc/data/rekonq.desktop1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop
index 17b46ffa..d53ff3d4 100755
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -1,5 +1,6 @@
[Desktop Entry]
Name=Rekonq
+Name[ast]=Rekonq
Name[bg]=Rekonq
Name[bs]=Rekonq
Name[ca]=Rekonq