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"
6 years ago · f353ed2a9b
parent 903cdec02b
commit f353ed2a9b
1 changed files with 1 additions and 0 deletions
--- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop
+++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop
@ -170,6 +170,7 @@ X-KDE-Keywords[fi]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[gl]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book
+X-KDE-Keywords[ja]=cbr, cbz, cbt, Comic Book
 X-KDE-Keywords[ko]=cbr, cbz, cbt, Comic Book,만화책
 X-KDE-Keywords[lt]=cbr, cbz, cbt, Comic Book, komiksų knygos, komiksu knygos
 X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie