From 4fb4547666c31538b759b8ebf26c79ca9d708768 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 20 Apr 2019 06:00:49 +0200 Subject: [PATCH] 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" --- fileitemactionplugin/kdeconnectsendfile.desktop | 1 + urlhandler/org.kde.kdeconnect.smshandler.desktop | 1 + urlhandler/org.kde.kdeconnect.telhandler.desktop | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index aa45deadf..5739baf41 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -3,6 +3,7 @@ Type=Service Name=Send file via KDE Connect service Name[ca]=Envia el fitxer a través del servei KDE Connect Name[ca@valencia]=Envia el fitxer a través del servei KDE Connect +Name[gl]=Enviar o ficheiro mediante o servizo de KDE Connect Name[nl]=Bestand via KDE Connect-service versturen Name[pt]=Enviar o ficheiro pelo serviço do KDE Connect Name[sv]=Skicka fil via KDE:s anslutningstjänst diff --git a/urlhandler/org.kde.kdeconnect.smshandler.desktop b/urlhandler/org.kde.kdeconnect.smshandler.desktop index 4e74805aa..73500dbbb 100644 --- a/urlhandler/org.kde.kdeconnect.smshandler.desktop +++ b/urlhandler/org.kde.kdeconnect.smshandler.desktop @@ -4,6 +4,7 @@ Name[ca]=Gestor d'URL de SMS del KDE Connect Name[ca@valencia]=Gestor d'URL de SMS del KDE Connect Name[en_GB]=KDE Connect SMS URL Handler Name[es]=Controlador de URL de SMS de KDE Connect +Name[gl]=Xestor de URL de SMS de KDE Connect Name[nl]=URL behandelaar van KDE-Connect-SMS Name[pt]=Tratamento de URL's de SMS do KDE Connect Name[pt_BR]=Tratamento de URLs de SMS do KDE Connect diff --git a/urlhandler/org.kde.kdeconnect.telhandler.desktop b/urlhandler/org.kde.kdeconnect.telhandler.desktop index 004107964..502dad12d 100644 --- a/urlhandler/org.kde.kdeconnect.telhandler.desktop +++ b/urlhandler/org.kde.kdeconnect.telhandler.desktop @@ -11,7 +11,7 @@ Name[es]=Controlador de URL de teléfonos de KDE Connect Name[eu]=KDE Connect-en telefono-URL-kudeatzailea Name[fi]=KDE Connectin puhelinverkko-osoitekäsittelijä Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect -Name[gl]=Manexador de URL de teléfono de KDE Connect +Name[gl]=Xestor de URL de teléfono de KDE Connect Name[id]=Penanganan URL Phone KDE Connect Name[it]=Gestore URL del telefono di KDE Connect Name[ko]=KDE Connect 휴대폰 URL 처리기