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
9647a104a7
commit
0ff05b0e39
|
@ -191,6 +191,7 @@ X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book
|
|||
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book
|
||||
X-KDE-Keywords[ru]=cbr, cbz, cbt, cb7, Comic Book, комикс
|
||||
X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Kniha komiksov
|
||||
X-KDE-Keywords[sl]=cbr, cbz, cbt, cbt7, strip
|
||||
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
|
||||
|
|
|
@ -183,6 +183,7 @@ X-KDE-Keywords[pt]=cbr, cbz, cbt, Comic Book
|
|||
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, Comic Book
|
||||
X-KDE-Keywords[ru]=cbr, cbz, cbt, Comic Book, комикс
|
||||
X-KDE-Keywords[sk]=cbr, cbz, cbt, Kniha komiksov
|
||||
X-KDE-Keywords[sl]=cbr, cbz, cbt, strip
|
||||
X-KDE-Keywords[sr]=cbr, cbz, cbt, Comic Book,комикбук
|
||||
X-KDE-Keywords[sr@ijekavian]=cbr, cbz, cbt, Comic Book,комикбук
|
||||
X-KDE-Keywords[sr@ijekavianlatin]=cbr, cbz, cbt, Comic Book,ComicBook
|
||||
|
|
Loading…
Reference in a new issue