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"
This commit is contained in:
l10n daemon script 2019-09-28 05:20:46 +02:00
parent 59f13d9bcf
commit 26c0a606d7
2 changed files with 2 additions and 0 deletions

View file

@ -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

View file

@ -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