Commit e8033ebc 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 c3e7ca4f
......@@ -3,6 +3,7 @@ Name=Login Screen
Name[ca]=Pantalla d'inici de sessió
Name[fr]=Écran de connexion
Name[nl]=Aanmeldscherm
Name[nn]=Innloggingsbilete
Name[pt]=Ecrã de Autenticação
Name[sv]=Inloggningsfönster
Name[uk]=Вікно входу
......
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