Commit 513e7ed2 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 80ccd7aa
Pipeline #29090 skipped
......@@ -72,6 +72,7 @@ X-KDE-Keywords=kaddressbook, configure, settings, LDAP
X-KDE-Keywords[ca]=kaddressbook, configura, arranjament, LDAP
X-KDE-Keywords[ca@valencia]=kaddressbook, configura, arranjament, LDAP
X-KDE-Keywords[cs]=kaddressbook, nastavit, nastavení, LDAP
X-KDE-Keywords[da]=kaddressbook, indstil, indstillinger, 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
......
......@@ -47,6 +47,7 @@ Comment=Resource to manage DAV calendars and address books (CalDAV, GroupDAV)
Comment[ar]=مورد لإدارة تقاويم ودفاتر عناوين DAV (مثل CalDAV وGroupDAV)
Comment[ca]=Recurs per a gestionar calendaris i llibretes d'adreces DAV (CalDAV, GroupDAV)
Comment[ca@valencia]=Recurs per a gestionar calendaris i llibretes d'adreces DAV (CalDAV, GroupDAV)
Comment[da]=Ressource til håndtering af DAV-kalendere og -adressebøger (CalDAV, GroupDAV)
Comment[de]=Ressource zur Verwaltung von DAV-Kalendern und -Adressbüchern (CalDAV, GroupDAV)
Comment[en_GB]=Resource to manage DAV calendars and address books (CalDAV, GroupDAV)
Comment[es]=Recurso para gestionar calendarios DAV y libretas de direcciones (CalDAV, GroupDAV)
......
......@@ -3,6 +3,7 @@ Name=Nextcloud
Name[ca]=Nextcloud
Name[ca@valencia]=Nextcloud
Name[cs]=NextCloud
Name[da]=Nextcloud
Name[de]=Nextcloud
Name[en_GB]=Nextcloud
Name[es]=Nextcloud
......
......@@ -4,6 +4,7 @@ Comment=Microsoft Exchange Server (EWS)
Comment[ca]=Servidor Microsoft Exchange (EWS)
Comment[ca@valencia]=Servidor Microsoft Exchange (EWS)
Comment[cs]=Server Microsoft Exchange (EWS)
Comment[da]=Microsoft Exchange-server (EWS)
Comment[de]=Microsoft Exchange Server (EWS)
Comment[en_GB]=Microsoft Exchange Server (EWS)
Comment[es]=Servidor Microsoft Exchange (EWS)
......
......@@ -4,6 +4,7 @@ Name[ar]=خادوم «مايكروسوفت إكسچينج» (EWS)
Name[ca]=Servidor Microsoft Exchange (EWS)
Name[ca@valencia]=Servidor Microsoft Exchange (EWS)
Name[cs]=Server Microsoft Exchange (EWS)
Name[da]=Microsoft Exchange-server (EWS)
Name[de]=Microsoft Exchange Server (EWS)
Name[en_GB]=Microsoft Exchange Server (EWS)
Name[es]=Servidor Microsoft Exchange (EWS)
......
......@@ -4,6 +4,7 @@ Name[ar]=ملفّ التّقاويم iCal
Name[ca]=Fitxer de calendari iCal
Name[ca@valencia]=Fitxer de calendari iCal
Name[cs]=Soubor s kalendářem iCal
Name[da]=iCal-kalenderfil
Name[de]=ICal-Kalenderdatei
Name[el]=Αρχείο ημερολογίου iCal
Name[en_GB]=iCal Calendar File
......
......@@ -4,6 +4,7 @@ Name[ar]=ملفّ التّقاويم iCal
Name[ca]=Fitxer de calendari iCal
Name[ca@valencia]=Fitxer de calendari iCal
Name[cs]=Soubor s kalendářem iCal
Name[da]=iCal-kalenderfil
Name[de]=ICal-Kalenderdatei
Name[el]=Αρχείο ημερολογίου iCal
Name[en_GB]=iCal Calendar File
......
......@@ -4,6 +4,7 @@ Name[ar]=مجلّد تقاويم iCal
Name[ca]=Carpeta de calendari iCal
Name[ca@valencia]=Carpeta de calendari iCal
Name[cs]=Složka kalendáře iCal
Name[da]=iCal-kalendermappe
Name[de]=ICal-Kalenderordner
Name[el]=Φάκελος ημερολογίου iCal
Name[en_GB]=iCal Calendar Folder
......@@ -37,6 +38,7 @@ Comment[ar]=يوفّر نفاذًا إلى عناصر التقويم (حيث ك
Comment[ca]=Proporciona accés als elements d'un calendari, cadascun emmagatzemat en un fitxer individual, en un directori proporcionat
Comment[ca@valencia]=Proporciona accés als elements d'un calendari, cadascun emmagatzemat en un fitxer individual, en un directori proporcionat
Comment[cs]=Poskytuje přístup k položkám kalendáře, každé uložené v jednom souboru v daném adresáři
Comment[da]=Giver adgang til en kalenderelementer, hver især gemt i en enkelt fil i en given mappe
Comment[de]=Ermöglicht Zugriff auf Kalender, die jeweils in einzelnen Dateien in einem vorgegebenen Ordner gespeichert sind
Comment[en_GB]=Provides access to calendar items, each stored in a single file, in a given directory
Comment[es]=Proporciona acceso a elementos de calendario, cada uno almacenado en un solo archivo, en un directorio dado
......
......@@ -51,6 +51,7 @@ Comment[ar]=يوفّر نفاذًا إلى المواعيد والمهام وم
Comment[bs]=Obezbjeđuje pristup zakazanim obavezama, zadacima i kontaktima za Open-Xchange grupni server.
Comment[ca]=Proporciona accés a les cites, tasques i contactes emmagatzemats en un servidor de treball en grup Open-Xchange.
Comment[ca@valencia]=Proporciona accés a les cites, tasques i contactes emmagatzemats en un servidor de treball en grup Open-Xchange.
Comment[da]=Giver adgang til aftaler, opgaver og kontakter på en Open-Xchange groupware-server.
Comment[de]=Ermöglicht den Zugriff auf Termine, Aufgaben und Kontakte, die auf einem Open-Xchange-Server gespeichert sind.
Comment[en_GB]=Provides access to the appointments, tasks, and contacts of an Open-Xchange groupware server.
Comment[es]=Proporciona acceso a las citas, tareas y contactos almacenados en un servidor de colaboración Open-Xchange.
......
......@@ -5,6 +5,7 @@ Comment[ar]=مورد POP3
Comment[ca]=Recurs POP3
Comment[ca@valencia]=Recurs POP3
Comment[cs]=Zdroj POP3
Comment[da]=POP3-ressource
Comment[de]=POP3-Ressource
Comment[el]=Πόρος POP3
Comment[en_GB]=POP3 Resource
......
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