mirror of
https://invent.kde.org/graphics/okular
synced 2024-06-30 22:54:24 +00:00
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"
This commit is contained in:
parent
d883cce698
commit
df3bfa005d
|
@ -28,7 +28,7 @@ Comment[hr]=Podrška za oblike datoteka za Okular
|
|||
Comment[hu]=Fájlformátumkezelő az Okularhoz
|
||||
Comment[ia]=Retro-administration de formato de file pro Okular
|
||||
Comment[ie]=Infrastructura de formate de file por Okular
|
||||
Comment[is]=Skráasniðsstuðningur fyrir Okular
|
||||
Comment[is]=Skráasniðsbakendi fyrir Okular
|
||||
Comment[it]=Backend per i formati di file di Okular
|
||||
Comment[ja]=Okular のファイル形式バックエンド
|
||||
Comment[ka]=ფაილის ფორმატის უკანაბოლო Okular-სთვის
|
||||
|
|
|
@ -217,6 +217,7 @@ X-KDE-Keywords[he]=cbr, cbz, cbt, cb7, Comic Book
|
|||
X-KDE-Keywords[hu]=cbr, cbz, cbt, cb7, Képregény
|
||||
X-KDE-Keywords[ia]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[ie]=cbr, cbz, cbt, cb7, Comic Book, dessinat
|
||||
X-KDE-Keywords[is]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[ka]=cbr, cbz, cbt, cb7, კომიქსები
|
||||
X-KDE-Keywords[ko]=cbr, cbz, cbt, cb7, Comic Book, 만화책, 만화
|
||||
|
|
|
@ -210,6 +210,7 @@ X-KDE-Keywords[he]=cbr, cbz, cbt, Comic Book
|
|||
X-KDE-Keywords[hu]=cbr, cbz, cbt, Képregény
|
||||
X-KDE-Keywords[ia]=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[ie]=cbr, cbz, cbt, Comic Book, dessinat
|
||||
X-KDE-Keywords[is]=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[ka]=cbr, cbz, cbt, კომიქსები
|
||||
|
|
|
@ -219,7 +219,7 @@ X-KDE-Keywords[he]=epub, e-book
|
|||
X-KDE-Keywords[hu]=epub, e-book
|
||||
X-KDE-Keywords[ia]=epub, e-book
|
||||
X-KDE-Keywords[ie]=epub, e-book
|
||||
X-KDE-Keywords[is]=epub, e-book, rafbók
|
||||
X-KDE-Keywords[is]=epub, e-book
|
||||
X-KDE-Keywords[it]=epub, e-book
|
||||
X-KDE-Keywords[ja]=epub, e-book
|
||||
X-KDE-Keywords[ka]=epub, e-book
|
||||
|
|
|
@ -212,7 +212,7 @@ X-KDE-Keywords[he]=epub, e-book
|
|||
X-KDE-Keywords[hu]=epub, e-book
|
||||
X-KDE-Keywords[ia]=epub, e-book
|
||||
X-KDE-Keywords[ie]=epub, e-book
|
||||
X-KDE-Keywords[is]=epub, e-book, rafbók
|
||||
X-KDE-Keywords[is]=epub, e-book
|
||||
X-KDE-Keywords[it]=epub, e-book
|
||||
X-KDE-Keywords[ja]=epub, e-book
|
||||
X-KDE-Keywords[ka]=epub, e-book
|
||||
|
|
Loading…
Reference in New Issue
Block a user