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 2018-06-18 05:29:43 +02:00
parent e8697fada6
commit 099592d38c
2 changed files with 2 additions and 2 deletions

View File

@ -20,7 +20,7 @@ Comment[gd]=Plasma ContainmentActions
Comment[gl]=ContainmentActions de Plasma
Comment[hu]=Plasma ContainmentActions
Comment[ia]=Actiones de continemento Plasma
Comment[id]=TindakanPembatasan Plasma
Comment[id]=AksiPembatasan Plasma
Comment[it]=ContainmentActions di Plasma
Comment[ko]=Plasma ContainmentActions
Comment[lt]=Plasma konteinerių veiksmai

View File

@ -26,7 +26,7 @@
"Name[fr]": "Actions de conteneur",
"Name[gl]": "Accións de contención",
"Name[ia]": "Actiones de continer",
"Name[id]": "Tindakan Pembatasan",
"Name[id]": "Aksi Pembatasan",
"Name[it]": "Azioni dei contenitori",
"Name[ko]": "컨테이너 동작",
"Name[nl]": "Containeracties",