Commit 2f70fe32 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 df583357
......@@ -60,6 +60,7 @@ Name[it]=Sistema di autenticazione
Name[ko]=인증 시스템
Name[nl]=Authenticatiesysteem
Name[nn]=Autentiseringssystem
Name[pa]=ਪਰਮਾਣਕਿਤਾ ਸਿਸਟਮ
Name[pt]=Sistema de Autenticação
Name[pt_BR]=Sistema de autenticação
Name[ro]=Sistem de autentificare
......@@ -87,6 +88,7 @@ Name[it]=Autenticazione
Name[ko]=인증
Name[nl]=Authenticeren
Name[nn]=Autentiser
Name[pa]=ਪਰਮਾਣਕਿਤਾ
Name[pt]=Autenticar
Name[pt_BR]=Autenticar
Name[ro]=Autentifică
......
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