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"
6 years ago · ea20992b60
parent cff573a9d4
commit ea20992b60
1 changed files with 1 additions and 0 deletions
--- a/wallpapers/Next/metadata.desktop
+++ b/wallpapers/Next/metadata.desktop
@ -21,6 +21,7 @@ Name[ru]=Ракушка
 Name[sk]=Ulita
 Name[uk]=Оболонка
 Name[x-test]=xxShellxx
+Name[zh_CN]=Shell
 Name[zh_TW]=殼層

 X-KDE-PluginInfo-Name=Next