Commit 87f98fa9 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 484d3a71
......@@ -5,6 +5,7 @@ Name[ca]=Comunicador
Name[ca@valencia]=Comunicador
Name[en_GB]=Communicator
Name[es]=Comunicador
Name[fi]=Viestin
Name[fr]=Communicateur
Name[it]=Communicator
Name[lt]=Pranešėjas
......@@ -29,6 +30,7 @@ GenericName[ca]=Gestor de contactes
GenericName[ca@valencia]=Gestor de contactes
GenericName[en_GB]=Contacts Manager
GenericName[es]=Administrador de contactos
GenericName[fi]=Yhteystietojen hallinta
GenericName[fr]=Gestionnaire de contacts
GenericName[it]=Gestore dei contatti
GenericName[nl]=Beheerder van contactpersonen
......
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