mirror of
https://invent.kde.org/graphics/okular
synced 2024-09-12 20:51:17 +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
5c6a297feb
commit
f2274e8992
|
@ -170,6 +170,7 @@ X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book
|
|||
X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[cs]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[da]=cbr, cbz, cbt, cb7, Comic Book
|
||||
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
|
||||
|
|
|
@ -160,6 +160,7 @@ X-KDE-Keywords=cbr, cbz, cbt, Comic Book
|
|||
X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[da]=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[de]=cbr, cbz, cbt, Comic-Book
|
||||
X-KDE-Keywords[en_GB]=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic
|
||||
|
|
Loading…
Reference in a new issue