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
67e7dc8f4c
commit
527737711f
|
@ -187,4 +187,5 @@ X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Kniha komiksov
|
|||
X-KDE-Keywords[sv]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[uk]=cbr,cbz,cbt,cb7,комікс
|
||||
X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx cb7xx,xx Comic Bookxx
|
||||
X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, cb7, Comic Book, 漫画书, 漫画, 连环画
|
||||
X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, cb7, Comic Book, 漫畫, 漫畫書
|
||||
|
|
|
@ -158,6 +158,7 @@ InitialPreference=2
|
|||
NoDisplay=true
|
||||
X-KDE-Keywords=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[cs]=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
|
||||
|
@ -175,3 +176,5 @@ X-KDE-Keywords[sr@latin]=cbr, cbz, cbt, Comic Book,ComicBook
|
|||
X-KDE-Keywords[sv]=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[uk]=cbr,cbz,cbt,комікс
|
||||
X-KDE-Keywords[x-test]=xxcbrxx,xx cbzxx,xx cbtxx,xx Comic Bookxx
|
||||
X-KDE-Keywords[zh_CN]=cbr, cbz, cbt, Comic Book,漫画书,漫画,连环画
|
||||
X-KDE-Keywords[zh_TW]=cbr, cbz, cbt, Comic Book, 漫畫, 漫畫書
|
||||
|
|
Loading…
Reference in a new issue