mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-24 18:35:37 +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
4a4a2a1b52
commit
59f13d9bcf
|
@ -176,6 +176,7 @@ X-KDE-Keywords[eu]=cbr, cbz, cbt, cb7, komiki-liburua
|
|||
X-KDE-Keywords[fr]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[gl]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[ko]=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
|
||||
|
|
|
@ -167,6 +167,7 @@ X-KDE-Keywords[eu]=cbr, cbz, cbt, cb7, komiki-liburua
|
|||
X-KDE-Keywords[fr]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[gl]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[ko]=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
|
||||
|
|
Loading…
Reference in a new issue