Commit 0ac3f27a authored by Script Kiddy's avatar Script Kiddy

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"
parent ecc1141e
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment