Commit 9e64a52e 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 e5f77f2a
......@@ -73,7 +73,7 @@ Name[fr]=Écran de connexion (SDDM)
Name[gl]=Pantalla de identificación (SDDM)
Name[he]=מסך התחברות
Name[hu]=Bejelentkező képernyő (SDDM)
Name[id]=Layar Log Masuk (SDDM)
Name[id]=Layar Login (SDDM)
Name[it]=Schermata di accesso (SDDM)
Name[ko]=로그인 화면(SDDM)
Name[lt]=Prisijungimo langas (SDDM)
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