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 · 26c5d9c8de
parent e27209f430
commit 26c5d9c8de
2 changed files with 4 additions and 0 deletions
--- a/generators/comicbook/okularApplication_comicbook.desktop
+++ b/generators/comicbook/okularApplication_comicbook.desktop
@ -178,7 +178,9 @@ X-KDE-Keywords[ja]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie
 X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal
 X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[pl]=cbr, cbz, cbt, Komiks
 X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[sk]=cbr, cbz, cbt, Comic Book, Kniha komiksov
 X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук
 X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук
--- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop
+++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop
@ -169,7 +169,9 @@ X-KDE-Keywords[ja]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie
 X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal
 X-KDE-Keywords[nn]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[pl]=cbr, cbz, cbt, Komiks
 X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[sk]=cbr, cbz, cbt, Comic Book, Kniha komiksov
 X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук
 X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук