Commit c2479a73 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 3eb6a91e
......@@ -171,6 +171,7 @@ X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book
X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book
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[it]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal
X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book
......
......@@ -162,6 +162,7 @@ X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book
X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book
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[it]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[nl]=cbr, cbz, cbt, cbz, Stripverhaal
X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book
......
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