From fe02874ca105dd0f1a92ed53e494a3d5c67f27b0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 19 Apr 2019 05:46:04 +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 | 4 ++++ urlhandler/org.kde.kdeconnect.smshandler.desktop | 1 + 2 files changed, 5 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index d39d3fa67..aa45deadf 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -2,7 +2,9 @@ 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[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 Name[uk]=Надіслати файл за допомогою служби KDE Connect Name[x-test]=xxSend file via KDE Connect servicexx @@ -13,6 +15,7 @@ X-KDE-Submenu[ar]=اتّصل,اتصل X-KDE-Submenu[bg]=Свързване X-KDE-Submenu[bs]=Uspostavi vezu X-KDE-Submenu[ca]=Connecta +X-KDE-Submenu[ca@valencia]=Connecta X-KDE-Submenu[da]=Forbind X-KDE-Submenu[de]=Verbinden X-KDE-Submenu[el]=Σύνδεση @@ -30,6 +33,7 @@ X-KDE-Submenu[it]=Connetti X-KDE-Submenu[ko]=연결 X-KDE-Submenu[nl]=Verbinden X-KDE-Submenu[pl]=Połącz +X-KDE-Submenu[pt]=Connect X-KDE-Submenu[ru]=KDE Connect X-KDE-Submenu[sk]=Pripojiť X-KDE-Submenu[sv]=Anslut diff --git a/urlhandler/org.kde.kdeconnect.smshandler.desktop b/urlhandler/org.kde.kdeconnect.smshandler.desktop index 166413980..4e74805aa 100644 --- a/urlhandler/org.kde.kdeconnect.smshandler.desktop +++ b/urlhandler/org.kde.kdeconnect.smshandler.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=KDE Connect SMS URL Handler 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[nl]=URL behandelaar van KDE-Connect-SMS