From c2ff5c5101e6b9e062b8dd7ac6679846c4acb595 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 3 Mar 2016 09:54:08 +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" --- fileitemactionplugin/kdeconnectsendfile.desktop | 1 + plugins/kdeconnect.notifyrc | 1 + plugins/notifications/kdeconnect_notifications_config.desktop | 1 + 3 files changed, 3 insertions(+) diff --git a/fileitemactionplugin/kdeconnectsendfile.desktop b/fileitemactionplugin/kdeconnectsendfile.desktop index d678fd49c..34d6fbbf2 100644 --- a/fileitemactionplugin/kdeconnectsendfile.desktop +++ b/fileitemactionplugin/kdeconnectsendfile.desktop @@ -34,6 +34,7 @@ Name[zh_CN]=通过 KDE Connect 服务发送文件 X-KDE-Library=kdeconnectfiletiemaction X-KDE-Submenu=Connect X-KDE-Submenu[ar]=اتّصل,اتصل +X-KDE-Submenu[ast]=Coneutar X-KDE-Submenu[bg]=Свързване X-KDE-Submenu[bs]=Uspostavi vezu X-KDE-Submenu[ca]=Connecta diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 1ca7f06ae..2ec8dc615 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -99,6 +99,7 @@ Name[x-test]=xxPairing Requestxx Name[zh_CN]=配对请求 Comment=Pairing request received from a device Comment[ar]=استُلم طلب اقتران من جهاز +Comment[ast]=Solicitú d'empareyamientu recibida d'un preséu Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu Comment[ca@valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu Comment[de]=Verbindungsanfrage von einem Gerät erhalten diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop index 80e8f4dc6..b582e1f97 100644 --- a/plugins/notifications/kdeconnect_notifications_config.desktop +++ b/plugins/notifications/kdeconnect_notifications_config.desktop @@ -7,6 +7,7 @@ X-KDE-ParentComponents=kdeconnect_notifications Name=Notification synchronization plugin settings Name[ar]=إعدادات ملحقة مزامنة الإخطارات +Name[ast]=Axustes del complementu de sincronización d'avisos Name[ca]=Ajustament del connector Sincronitza les notificacions Name[ca@valencia]=Ajustament del connector Sincronitza les notificacions Name[cs]=Nastavení modulu synchronizace upozornění