Commit ccb2e7ab 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 45b2c9b7
[Desktop Entry]
Name=Communicator
Name[ast]=Communicator
Name[ca]=Comunicador
Name[ca@valencia]=Comunicador
Name[en_GB]=Communicator
Name[lt]=Pranešėjas
Name[nl]=Communicator
Name[nn]=Communicator
Name[pt]=Comunicador
Name[sk]=Komunikátor
Name[sv]=Communicator
......@@ -17,9 +19,11 @@ Terminal=false
Type=Application
Categories=Qt;KDE;System;
GenericName=Contacts Manager
GenericName[ast]=Xestor de contautos
GenericName[ca]=Gestor de contactes
GenericName[en_GB]=Contacts Manager
GenericName[nl]=Beheerder van contactpersonen
GenericName[nn]=Kontakthandsamar
GenericName[pt]=Gestor de contactos
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