From a1653720e5ce5698f97ca8539f7c37d630b7d573 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Feb 2023 02:05:26 +0000 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" --- kcm/kcm_kdeconnect.json | 2 ++ plugins/contacts/kdeconnect_contacts.json | 1 + plugins/mmtelephony/kdeconnect_mmtelephony.json | 1 + 3 files changed, 4 insertions(+) diff --git a/kcm/kcm_kdeconnect.json b/kcm/kcm_kdeconnect.json index 3e55ad3e5..1da17e504 100644 --- a/kcm/kcm_kdeconnect.json +++ b/kcm/kcm_kdeconnect.json @@ -7,6 +7,7 @@ "Description[ca@valencia]": "Connecta i sincronitza els vostres dispositius", "Description[ca]": "Connecta i sincronitza els vostres dispositius", "Description[cs]": "Připojte a synchronizujte svá zařízení", + "Description[de]": "Verbinden und Abgleichen Ihrer Geräte", "Description[en_GB]": "Connect and sync your devices", "Description[es]": "Conecta y sincroniza sus dispositivos", "Description[eu]": "Zure gailuak konektatu eta sinkronizatzea", @@ -35,6 +36,7 @@ "Name[ca@valencia]": "KDE Connect", "Name[ca]": "KDE Connect", "Name[cs]": "KDE Connect", + "Name[de]": "KDE Connect", "Name[en_GB]": "KDE Connect", "Name[es]": "KDE Connect", "Name[eu]": "KDE Connect", diff --git a/plugins/contacts/kdeconnect_contacts.json b/plugins/contacts/kdeconnect_contacts.json index 51a03e1e1..21b6f754c 100644 --- a/plugins/contacts/kdeconnect_contacts.json +++ b/plugins/contacts/kdeconnect_contacts.json @@ -54,6 +54,7 @@ "Description[ca@valencia]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori", "Description[ca]": "Sincronitza els contactes des del dispositiu connectat a l'escriptori", "Description[cs]": "Synchronizovat kontakty z připojeného zařízení do pracovního prostředí", + "Description[de]": "Abgleich von Kontakten vom angeschlossenen Gerät zum Arbeitsplatz", "Description[en_GB]": "Synchronise Contacts from the Connected Device to the Desktop", "Description[es]": "Sincronizar contactos desde el dispositivo conectado al equipo de escritorio", "Description[eu]": "Sinkronizatu kontaktuak konektatutako gailutik mahaigainera", diff --git a/plugins/mmtelephony/kdeconnect_mmtelephony.json b/plugins/mmtelephony/kdeconnect_mmtelephony.json index baf3c23fc..7c74629d3 100644 --- a/plugins/mmtelephony/kdeconnect_mmtelephony.json +++ b/plugins/mmtelephony/kdeconnect_mmtelephony.json @@ -9,6 +9,7 @@ "Name[ca@valencia]": "Yoram Bar-Haim", "Name[ca]": "Yoram Bar-Haim", "Name[cs]": "Yoram Bar-Haim", + "Name[de]": "Yoram Bar-Haim", "Name[en_GB]": "Yoram Bar-Haim", "Name[es]": "Yoram Bar-Haim", "Name[eu]": "Yoram Bar-Haim",