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
2a3820aba1
commit
774bcbc4ef
|
@ -167,6 +167,7 @@ Categories=Qt;KDE;Graphics;Viewer;
|
|||
NoDisplay=true
|
||||
X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[cs]=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
|
||||
|
|
|
@ -158,6 +158,7 @@ InitialPreference=2
|
|||
NoDisplay=true
|
||||
X-KDE-Keywords=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[cs]=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
|
||||
|
|
Loading…
Reference in a new issue