summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorl10n daemon script <scripty@kde.org>2015-03-26 04:46:00 +0000
committerl10n daemon script <scripty@kde.org>2015-03-26 04:46:00 +0000
commit4c970221f8ba7506e96ae7655fee0c4c27768102 (patch)
tree1000d280087cffcfd6634867c04283e510e804be /src
parentAdd missing colon (diff)
downloadrekonq-4c970221f8ba7506e96ae7655fee0c4c27768102.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 bb63e45b..17b46ffa 100755
--- a/src/data/rekonq.desktop
+++ b/src/data/rekonq.desktop
@@ -57,6 +57,7 @@ GenericName[da]=Webbrowser
GenericName[de]=Webbrowser
GenericName[el]=Περιηγητής ιστού
GenericName[en_GB]=Web Browser
+GenericName[eo]=TTT-foliumilo
GenericName[es]=Navegador web
GenericName[et]=Veebilehitseja
GenericName[eu]=Web-arakatzailea