Commit d7cdf6f4 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 dc97d9fd
Pipeline #27948 skipped
......@@ -19,6 +19,7 @@ Name[el]=Ρυθμίσεις εξυπηρετητή LDAP
Name[en_GB]=LDAP Server Settings
Name[es]=Preferencias del servidor LDAP
Name[et]=LDAP serveri seadistused
Name[fi]=LDAP-palvelinasetukset
Name[fr]=Paramètres du serveur « LDAP »
Name[ga]=Socruithe Freastalaí LDAP
Name[ia]=Preferentias del servitor LDAP
......@@ -48,6 +49,7 @@ Comment[el]=Ρύθμιση των διαθέσιμων εξυπηρετητών
Comment[en_GB]=Configure the available LDAP servers
Comment[es]=Configurar los servidores LDAP disponibles
Comment[et]=Saadaolevate LDAP serverite seadistamine
Comment[fi]=Saatavilla olevien LDAP-palvelinten asetukset
Comment[fr]=Configurer les serveurs disponibles « LDAP »
Comment[ga]=Cumraigh na freastalaithe LDAP atá ar fáil
Comment[ia]=Configura le servitores LDAP accessibile
......@@ -73,6 +75,7 @@ X-KDE-Keywords[cs]=kaddressbook, nastavit, nastavení, LDAP
X-KDE-Keywords[en_GB]=kaddressbook, configure, settings, LDAP
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[it]=kaddressbook, configurazione, impostazioni, LDAP
X-KDE-Keywords[ko]=kaddressbook, configure, settings, LDAP, 설정, 주소록
......
......@@ -26,6 +26,7 @@ Comment[de]=Greifen Sie in KDE auf Ihre Google-Kalender, -Kontakte und -Aufgaben
Comment[en_GB]=Access your Google Calendars, Contacts and Tasks from KDE
Comment[es]=Acceda a sus calendarios, contactos y tareas de Google desde KDE
Comment[et]=Oma Google'i kalendrite, kontaktide ja ülesannete kasutamine otse KDE-st
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[it]=Accedi ai tuoi calendari, contatti e attività Google da KDE
Comment[ko]=KDE에서 Google 캘린더, 연락처, 할 일에 접근합니다
......
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