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"
5 years ago · 47e87b0ea8
parent f9758726ee
commit 47e87b0ea8
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -20,6 +20,7 @@ Name[sl]=Mlečna cesta
 Name[sv]=Vintergatan
 Name[uk]=Чумацький Шлях
 Name[x-test]=xxMilky Wayxx
+Name[zh_CN]=Milky Way 银河

 X-KDE-PluginInfo-Name=Next
 X-KDE-PluginInfo-Author=ruvkr