Commit 03ce7347 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 82205656
......@@ -13,6 +13,7 @@ Name[nl]=Aanmeldscherm
Name[nn]=Innloggingsbilete
Name[pt]=Ecrã de Autenticação
Name[pt_BR]=Tela de autenticação
Name[ru]=Вход в систему
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