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 · df7a8d67e7
parent 0fbe40dfb4
commit df7a8d67e7
2 changed files with 4 additions and 0 deletions
--- a/generators/comicbook/okularApplication_comicbook.desktop
+++ b/generators/comicbook/okularApplication_comicbook.desktop
@ -171,7 +171,9 @@ X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book
 X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic
+X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal
+X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks
 X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book
--- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop
+++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop
@ -162,7 +162,9 @@ X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book
 X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic
+X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal
+X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks
 X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book
 X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book