From 120218b7c108af10d4b5e41eccd50320e94e4cd3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 25 Sep 2020 06:18:57 +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.json | 1 + plugins/bigscreen/kdeconnect_bigscreen.json | 1 + plugins/findthisdevice/kdeconnect_findthisdevice.json | 2 +- settings/org.kde.kdeconnect.settings.desktop | 2 +- smsapp/org.kde.kdeconnect.sms.desktop | 2 +- urlhandler/org.kde.kdeconnect.handler.desktop | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json index ef7f3c0f9..c147bf95e 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -42,6 +42,7 @@ "Name[ca]": "Envia el fitxer a través del KDE Connect", "Name[cs]": "Poslat soubor přes KDE Connect", "Name[da]": "Send fil via KDE Connect", + "Name[de]": "Datei mit KDE Connect versenden", "Name[en_GB]": "Send file via KDE Connect", "Name[es]": "Enviar archivo con KDE Connect", "Name[et]": "Faili saatmine KDE Connecti kaudu", diff --git a/plugins/bigscreen/kdeconnect_bigscreen.json b/plugins/bigscreen/kdeconnect_bigscreen.json index 6939d4ff3..1f782609c 100644 --- a/plugins/bigscreen/kdeconnect_bigscreen.json +++ b/plugins/bigscreen/kdeconnect_bigscreen.json @@ -9,6 +9,7 @@ "Name[ca]": "Aditya Mehra", "Name[cs]": "Aditya Mehra", "Name[da]": "Aditya Mehra", + "Name[de]": "Aditya Mehra", "Name[en_GB]": "Aditya Mehra", "Name[es]": "Aditya Mehra", "Name[et]": "Aditya Mehra", diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice.json b/plugins/findthisdevice/kdeconnect_findthisdevice.json index e180f463d..ce5f2f3ae 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice.json +++ b/plugins/findthisdevice/kdeconnect_findthisdevice.json @@ -82,7 +82,7 @@ "Name[ca]": "Troba aquest dispositiu", "Name[cs]": "Najít toto zařízení", "Name[da]": "Find denne enhed", - "Name[de]": "Diese Gerät suchen", + "Name[de]": "Dieses Gerät suchen", "Name[en_GB]": "Find this device", "Name[es]": "Encontrar este dispositivo", "Name[et]": "Seadme leidmine", diff --git a/settings/org.kde.kdeconnect.settings.desktop b/settings/org.kde.kdeconnect.settings.desktop index 542533d21..d26379831 100755 --- a/settings/org.kde.kdeconnect.settings.desktop +++ b/settings/org.kde.kdeconnect.settings.desktop @@ -11,7 +11,7 @@ Name[ca]=Arranjament del KDE Connect Name[ca@valencia]=Arranjament del KDE Connect Name[cs]=Nastavení KDE Connect Name[da]=Indstilling af KDE Connect -Name[de]=KDE-Connect-Einstellungen +Name[de]=KDE Connect-Einstellungen Name[el]=Ρυθμίσεις KDE Connect Name[en_GB]=KDE Connect Settings Name[es]=Ajustes de KDE Connect diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop index b68210d48..8593dc8e4 100644 --- a/smsapp/org.kde.kdeconnect.sms.desktop +++ b/smsapp/org.kde.kdeconnect.sms.desktop @@ -6,7 +6,7 @@ Name[ca]=SMS del KDE Connect Name[ca@valencia]=SMS del KDE Connect Name[cs]=KDE Connect SMS Name[da]=KDE Connect SMS -Name[de]=KDE-Connect-SMS +Name[de]=KDE Connect-SMS Name[en_GB]=KDE Connect SMS Name[es]=SMS de KDE Connect Name[et]=KDE Connecti SMS diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop index 0aff20f78..092b309bd 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -5,6 +5,7 @@ Name[ca]=Gestor d'URL del KDE Connect Name[ca@valencia]=Gestor d'URL del KDE Connect Name[cs]=Nástroj pro práci s URL v KDE Connect Name[da]=URL-håndtering til KDE Connect +Name[de]=KDE Connect-SMS-Dienstprogramm für URLs (Adressen) Name[en_GB]=KDE Connect URL Handler Name[es]=Controlador de URL de KDE Connect Name[et]=KDE Connecti URL-ide käitleja