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 · 1d36cd158f
parent 48905cf16b
commit 1d36cd158f
4 changed files with 4 additions and 0 deletions
--- a/generators/djvu/active-documentviewer_djvu.desktop
+++ b/generators/djvu/active-documentviewer_djvu.desktop
@ -161,6 +161,7 @@ X-KDE-Keywords[da]=djvu
 X-KDE-Keywords[de]=djvu
 X-KDE-Keywords[el]=djvu
 X-KDE-Keywords[en_GB]=djvu
+X-KDE-Keywords[eo]=djvu
 X-KDE-Keywords[es]=djvu
 X-KDE-Keywords[et]=djvu
 X-KDE-Keywords[fi]=djvu
--- a/generators/djvu/okularApplication_djvu.desktop
+++ b/generators/djvu/okularApplication_djvu.desktop
@ -141,6 +141,7 @@ X-KDE-Keywords[da]=djvu
 X-KDE-Keywords[de]=djvu
 X-KDE-Keywords[el]=djvu
 X-KDE-Keywords[en_GB]=djvu
+X-KDE-Keywords[eo]=djvu
 X-KDE-Keywords[es]=djvu
 X-KDE-Keywords[et]=djvu
 X-KDE-Keywords[fi]=djvu
--- a/generators/dvi/active-documentviewer_dvi.desktop
+++ b/generators/dvi/active-documentviewer_dvi.desktop
@ -161,6 +161,7 @@ X-KDE-Keywords[da]=dvi
 X-KDE-Keywords[de]=dvi
 X-KDE-Keywords[el]=dvi
 X-KDE-Keywords[en_GB]=dvi
+X-KDE-Keywords[eo]=dvi
 X-KDE-Keywords[es]=dvi
 X-KDE-Keywords[et]=dvi
 X-KDE-Keywords[fi]=dvi
--- a/generators/dvi/okularApplication_dvi.desktop
+++ b/generators/dvi/okularApplication_dvi.desktop
@ -141,6 +141,7 @@ X-KDE-Keywords[da]=dvi
 X-KDE-Keywords[de]=dvi
 X-KDE-Keywords[el]=dvi
 X-KDE-Keywords[en_GB]=dvi
+X-KDE-Keywords[eo]=dvi
 X-KDE-Keywords[es]=dvi
 X-KDE-Keywords[et]=dvi
 X-KDE-Keywords[fi]=dvi