mirror of
https://invent.kde.org/graphics/okular
synced 2024-08-27 19:50:27 +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
76a4ad6323
commit
e7702e0a8c
|
@ -183,7 +183,7 @@ X-KDE-Keywords[et]=epub, e-book, e-raamat
|
|||
X-KDE-Keywords[fi]=epub, e-book, e-kirja, sähkökirja
|
||||
X-KDE-Keywords[fr]=epub, e-book
|
||||
X-KDE-Keywords[ga]=epub, ríomhleabhar, r-leabhar
|
||||
X-KDE-Keywords[gl]=epub, e-book,libro dixital
|
||||
X-KDE-Keywords[gl]=epub, e-book, libro dixital
|
||||
X-KDE-Keywords[hu]=epub, e-book
|
||||
X-KDE-Keywords[ia]=epub, e-book
|
||||
X-KDE-Keywords[is]=epub, e-book, rafbók
|
||||
|
|
|
@ -173,7 +173,7 @@ X-KDE-Keywords[et]=epub, e-book, e-raamat
|
|||
X-KDE-Keywords[fi]=epub, e-book, e-kirja, sähkökirja
|
||||
X-KDE-Keywords[fr]=epub, e-book
|
||||
X-KDE-Keywords[ga]=epub, ríomhleabhar, r-leabhar
|
||||
X-KDE-Keywords[gl]=epub, e-book,libro dixital
|
||||
X-KDE-Keywords[gl]=epub, e-book, libro dixital
|
||||
X-KDE-Keywords[hu]=epub, e-book
|
||||
X-KDE-Keywords[ia]=epub, e-book
|
||||
X-KDE-Keywords[is]=epub, e-book, rafbók
|
||||
|
|
Loading…
Reference in a new issue