Commit 7ee6fa1e 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 ec97e1e4
......@@ -5,6 +5,7 @@ Name[ca@valencia]=Pantalla d'inici de sessió
Name[de]=Anmeldebildschirm
Name[es]=Pantalla de inicio de sesión
Name[fr]=Écran de connexion
Name[hu]=Bejelentkező képernyő
Name[id]=Login Screen
Name[nl]=Aanmeldscherm
Name[nn]=Innloggingsbilete
......
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