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"
8 years ago · 4be9264b8a
parent 0cae991804
commit 4be9264b8a
1 changed files with 1 additions and 1 deletions
--- a/effects/slide/slide_config.desktop
+++ b/effects/slide/slide_config.desktop
@ -67,5 +67,5 @@ Name[ug]=تام تەسۋىر
 Name[uk]=Ковзання
 Name[wa]=Rider
 Name[x-test]=xxSlidexx
-Name[zh_CN]=滑行
+Name[zh_CN]=滑动
 Name[zh_TW]=滑動