Commit 33a714a9 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 07f03b47
Pipeline #28129 skipped
......@@ -77,6 +77,7 @@ X-KDE-Keywords[es]=kaddressbook, configurar, preferencias, LDAP
X-KDE-Keywords[et]=kde aadressiraamat, seadistamine, seadistused, LDAP
X-KDE-Keywords[fi]=kaddressbook, asetukset, LDAP
X-KDE-Keywords[fr]=KAddressBook, configurer, paramètres, « LDAP »
X-KDE-Keywords[ia]=kaddressbook, configura, preferentias, LDAP
X-KDE-Keywords[it]=kaddressbook, configurazione, impostazioni, LDAP
X-KDE-Keywords[ko]=kaddressbook, configure, settings, LDAP, 설정, 주소록
X-KDE-Keywords[nl]=kaddressbook, configureren, instellingen, LDAP
......
......@@ -8,6 +8,7 @@ Name[es]=Google Groupware
Name[et]=Google Groupware
Name[fi]=Google Groupware
Name[fr]=Logiciel de groupe de travail « Google Groupware »
Name[ia]=Google Groupware
Name[it]=Google Groupware
Name[ko]=Google 그룹웨어
Name[nl]=Google Groupware
......@@ -25,6 +26,7 @@ Comment[cs]=Přistupujte ke k kalendářům, kontaktům a úkolům z KDE
Comment[es]=Acceda a sus calendarios, contactos y tareas de Google desde KDE
Comment[fi]=Pääsy Googlen kalentereihin ja tehtäviin KDE:sta
Comment[fr]=Accès à vos agendas, contacts et tâches Google depuis KDE
Comment[ia]=Accede a tu Calendarios, Contactos e Cargas de Google ab KDE
Comment[it]=Accedi ai tuoi calendari, contatti e attività Google da KDE
Comment[nl]=Heb toegang tot uw Google agenda's, contactpersonen en taken vanuit KDE
Comment[pt]=Aceda aos seus calendários, contactos e tarefas da Google a partir do KDE
......
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