Commit 26c0a606 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 59f13d9b
......@@ -175,6 +175,7 @@ X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic
X-KDE-Keywords[eu]=cbr, cbz, cbt, cb7, komiki-liburua
X-KDE-Keywords[fr]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[gl]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ia]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ko]=cbr, cbz, cbt, cb7, Comic Book, 만화책, 만화
X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal
......
......@@ -166,6 +166,7 @@ X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic
X-KDE-Keywords[eu]=cbr, cbz, cbt, cb7, komiki-liburua
X-KDE-Keywords[fr]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[gl]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ia]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[it]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[ko]=cbr, cbz, cbt, cb7, Comic Book, 만화책, 만화
X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal
......
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