Commit a90bf7fe 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 1da31df8
Pipeline #8737 passed with stage
in 11 minutes and 16 seconds
......@@ -163,6 +163,7 @@ X-KDE-Keywords[en_GB]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic
X-KDE-Keywords[fr]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[gl]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[it]=cbr, cbz, cbt, Comic Book
X-KDE-Keywords[nb]=cbr, cbz, cbt, tegneserie
X-KDE-Keywords[nl]=cbr, cbz, cbt, Stripverhaal
X-KDE-Keywords[nn]=cbr, cbz, cbt, 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