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
0fbe40dfb4
commit
df7a8d67e7
|
@ -171,7 +171,9 @@ 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[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
|
||||
X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks
|
||||
X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book
|
||||
|
|
|
@ -162,7 +162,9 @@ 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[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
|
||||
X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks
|
||||
X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book
|
||||
|
|
Loading…
Reference in a new issue