Commit ab88b534 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 f74f80c6
......@@ -4,6 +4,7 @@ Name[ast]=Communicator
Name[ca]=Comunicador
Name[ca@valencia]=Comunicador
Name[en_GB]=Communicator
Name[fr]=Communicateur
Name[it]=Communicator
Name[lt]=Pranešėjas
Name[nl]=Communicator
......@@ -25,6 +26,7 @@ GenericName[ast]=Xestor de contautos
GenericName[ca]=Gestor de contactes
GenericName[ca@valencia]=Gestor de contactes
GenericName[en_GB]=Contacts Manager
GenericName[fr]=Gestionnaire de contacts
GenericName[it]=Gestore dei contatti
GenericName[nl]=Beheerder van contactpersonen
GenericName[nn]=Kontakthandsamar
......
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