Commit ea20992b authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent cff573a9
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment