Commit e93cee60 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 1c1f654b
......@@ -5,11 +5,13 @@ 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[gl]=Pantalla de identificación
Name[hu]=Bejelentkező képernyő
Name[id]=Login Screen
Name[nl]=Aanmeldscherm
Name[nn]=Innloggingsbilete
Name[pt]=Ecrã de Autenticação
Name[pt_BR]=Tela de autenticação
Name[sv]=Inloggningsfönster
Name[uk]=Вікно входу
Name[x-test]=xxLogin Screenxx
......
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