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
3eb6a91e25
commit
c2479a733b
|
@ -171,6 +171,7 @@ 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[eu]=cbr, cbz, cbt, cb7, komiki-liburua
|
||||
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
|
||||
|
|
|
@ -162,6 +162,7 @@ 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[eu]=cbr, cbz, cbt, cb7, komiki-liburua
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue