Commit a6163b57 authored by Script Kiddy's avatar Script Kiddy

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 b8d0537b
......@@ -100,7 +100,6 @@ Name[zh_CN]=登录屏幕 (SDDM)
Name[zh_TW]=登入畫面(SDDM)
Comment=Configure Login Manager
Comment[ar]=اضبط مدير الولوج
Comment[ca]=Configura el gestor d'accés
Comment[ca@valencia]=Configura el gestor d'accés
Comment[cs]=Nastavit správce přihlášení...
......
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