From 3cdd01261a8f16661a6c9036a649f2f5511642a2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 May 2019 08:50:26 +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 | 2 ++ plugins/sendnotifications/kdeconnect_sendnotifications.json | 2 ++ plugins/telephony/kdeconnect_telephony.json | 1 + 3 files changed, 5 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index 46d1d8afa..cf77dc0d3 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[cs]=Poslat soubor přes službu KDE Connect Name[en_GB]=Send file via KDE Connect service Name[es]=Enviar archivo a través del servicio KDE Connect Name[fi]=Lähetä tiedosto KDE Connect -palvelulla @@ -25,6 +26,7 @@ X-KDE-Submenu[bg]=Свързване X-KDE-Submenu[bs]=Uspostavi vezu X-KDE-Submenu[ca]=Connecta X-KDE-Submenu[ca@valencia]=Connecta +X-KDE-Submenu[cs]=Připojit X-KDE-Submenu[da]=Forbind X-KDE-Submenu[de]=Verbinden X-KDE-Submenu[el]=Σύνδεση diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index 31df78d5c..6b49a5864 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -44,6 +44,7 @@ "Description[ar]": "بُثّ إخطارات هذا الحاسوب، لتظهر على الأجهزة الأخرى.", "Description[ca@valencia]": "Fa difusió de les notificacions d'aquest ordinador, de manera que es poden mostrar en altres dispositius.", "Description[ca]": "Fa difusió de les notificacions d'aquest ordinador, de manera que es poden mostrar en altres dispositius.", + "Description[cs]": "Posílat upozornění tohoto počítače, takže mohou být zobrazena na jiných zařízeních.", "Description[da]": "Udsend denne computers bekendtgørelser, så de kan vises på andre enheder.", "Description[de]": "Die Benachrichtigungen dieses Rechners aussenden, sodass sie auf anderen Geräten angezeigt werden können.", "Description[el]": "Μεταδώστε την ειδοποίηση αυτού του υπολογιστή, ώστε να εμφανιστεί σε άλλες συσκευές.", @@ -78,6 +79,7 @@ "Name[ar]": "أرسل إخطارات", "Name[ca@valencia]": "Envia les notificacions", "Name[ca]": "Envia les notificacions", + "Name[cs]": "Posílat oznamování", "Name[da]": "Send bekendtgørelser", "Name[de]": "Benachrichtigungen senden", "Name[el]": "Αποστολή ειδοποιήσεων", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index d3c9a0e34..8260db17d 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -43,6 +43,7 @@ "Description": "Show notifications for calls and SMS", "Description[ca@valencia]": "Mostra les notificacions de les trucades i els SMS", "Description[ca]": "Mostra les notificacions de les trucades i els SMS", + "Description[cs]": "Zobrazit upozornění pro telefonáty a SMS", "Description[en_GB]": "Show notifications for calls and SMS", "Description[es]": "Mostrar notificaciones para llamadas y SMS", "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset",