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"
2018-02-05 06:51:49 +01:00 · 2018-02-05 06:51:49 +01:00 · 93dd777351
commit 93dd777351
parent aefa11f11a
1 changed files with 1 additions and 0 deletions
--- a/effects/slide/slide_config.desktop
+++ b/effects/slide/slide_config.desktop
@ -32,6 +32,7 @@ Name[hu]=Csúsztatott váltás
 Name[ia]=Glissa
 Name[is]=Renna til
 Name[it]=Scivola
+Name[ja]=スライド
 Name[kk]=Сырғанату
 Name[km]=ស្លាយ
 Name[kn]=ಜಾರು