Commit f74f80c6 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 ccb2e7ab
...@@ -4,11 +4,13 @@ Name[ast]=Communicator ...@@ -4,11 +4,13 @@ Name[ast]=Communicator
Name[ca]=Comunicador Name[ca]=Comunicador
Name[ca@valencia]=Comunicador Name[ca@valencia]=Comunicador
Name[en_GB]=Communicator Name[en_GB]=Communicator
Name[lt]=Pranešėjas Name[lt]=Pranešėjas
Name[nl]=Communicator Name[nl]=Communicator
Name[nn]=Communicator Name[nn]=Communicator
Name[pt]=Comunicador Name[pt]=Comunicador
Name[sk]=Komunikátor Name[sk]=Komunikátor
Name[sv]=Communicator Name[sv]=Communicator
Name[uk]=Комунікатор Name[uk]=Комунікатор
Name[x-test]=xxCommunicatorxx Name[x-test]=xxCommunicatorxx
...@@ -21,10 +23,13 @@ Categories=Qt;KDE;System; ...@@ -21,10 +23,13 @@ Categories=Qt;KDE;System;
GenericName=Contacts Manager GenericName=Contacts Manager
GenericName[ast]=Xestor de contautos GenericName[ast]=Xestor de contautos
GenericName[ca]=Gestor de contactes GenericName[ca]=Gestor de contactes
GenericName[ca@valencia]=Gestor de contactes
GenericName[en_GB]=Contacts Manager GenericName[en_GB]=Contacts Manager
GenericName[it]=Gestore dei contatti
GenericName[nl]=Beheerder van contactpersonen GenericName[nl]=Beheerder van contactpersonen
GenericName[nn]=Kontakthandsamar GenericName[nn]=Kontakthandsamar
GenericName[pt]=Gestor de contactos GenericName[pt]=Gestor de contactos
GenericName[sl]=Upravljalnik stikov
GenericName[sv]=Kontakthanterare GenericName[sv]=Kontakthanterare
GenericName[uk]=Керування контактами GenericName[uk]=Керування контактами
GenericName[x-test]=xxContacts Managerxx GenericName[x-test]=xxContacts Managerxx
...@@ -67,7 +67,7 @@ Comment[nn]=Du mista ei oppringing ...@@ -67,7 +67,7 @@ Comment[nn]=Du mista ei oppringing
Comment[pt]=Uma chamada não foi atendida Comment[pt]=Uma chamada não foi atendida
Comment[pt_BR]=Uma chamada não foi atendida Comment[pt_BR]=Uma chamada não foi atendida
Comment[ro]=A fost pierdut un apel Comment[ro]=A fost pierdut un apel
Comment[sl]=Klic je bil zgrešen Comment[sl]=Bil je zgrešen klic
Comment[sv]=Ett samtal har missats Comment[sv]=Ett samtal har missats
Comment[uk]=Було пропущено дзвінок Comment[uk]=Було пропущено дзвінок
Comment[x-test]=xxA call has been missedxx Comment[x-test]=xxA call has been missedxx
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