Commit da5bed48 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 0a15f75d
......@@ -11,6 +11,7 @@ Name[lt]=Pranešėjas
Name[nl]=Communicator
Name[nn]=Communicator
Name[pt]=Comunicador
Name[pt_BR]=Comunicador
Name[sk]=Komunikátor
Name[sl]=Communicator
Name[sv]=Communicator
......@@ -33,6 +34,7 @@ GenericName[it]=Gestore dei contatti
GenericName[nl]=Beheerder van contactpersonen
GenericName[nn]=Kontakthandsamar
GenericName[pt]=Gestor de contactos
GenericName[pt_BR]=Gerenciador de contatos
GenericName[sl]=Upravljalnik stikov
GenericName[sv]=Kontakthanterare
GenericName[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