Commit 87f80c34 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 241e807b
......@@ -179,6 +179,7 @@ X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks
X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Kniha komiksov
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
......
......@@ -170,6 +170,7 @@ X-KDE-Keywords[nn]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pl]=cbr, cbz, cbt, cb7, Komiks
X-KDE-Keywords[pt]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[pt_BR]=cbr, cbz, cbt, cb7, Comic Book
X-KDE-Keywords[sk]=cbr, cbz, cbt, cb7, Kniha komiksov
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
......
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