From 283211b4ebd970f0ed1db6556c2673b2f39042ca Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 10 Oct 2018 06:19:16 +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" --- app/org.kde.kdeconnect.app.desktop | 3 --- daemon/kdeconnect.desktop | 2 -- daemon/kdeconnectd.desktop.cmake | 1 - indicator/org.kde.kdeconnect.nonplasma.desktop | 1 - kcm/kcm_kdeconnect.desktop | 3 --- kcm/org.kde.kdeconnect.kcm.desktop | 2 -- plasmoid/package/metadata.desktop | 2 -- plugins/kdeconnect.notifyrc | 18 ------------------ plugins/kdeconnect_plugin.desktop | 1 - .../kdeconnect_pausemusic_config.desktop | 1 - .../kdeconnect_runcommand_config.desktop | 1 - ...kdeconnect_sendnotifications_config.desktop | 1 - plugins/share/kdeconnect_share_config.desktop | 1 - plugins/sms/kdeconnect_sms.json | 3 +++ .../systemvolume/kdeconnect_systemvolume.json | 2 ++ sfos/kdeconnect-sfos.desktop | 1 - sfos/kdeconnectd.desktop.cmake | 1 - 17 files changed, 5 insertions(+), 39 deletions(-) diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop index 1f6aea4f2..15711a72d 100644 --- a/app/org.kde.kdeconnect.app.desktop +++ b/app/org.kde.kdeconnect.app.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Name=KDE Connect Application Name[ar]=تطبيق كدي المتّصل -Name[ast]=Aplicación KDE Connect Name[ca]=Aplicació KDE Connect Name[ca@valencia]=Aplicació KDE Connect Name[cs]=Aplikace KDE Connect @@ -39,7 +38,6 @@ Name[zh_CN]=KDE Connect 应用程序 Name[zh_TW]=KDE 連線應用程式 GenericName=Device Synchronization GenericName[ar]=مزامنة الأجهزة -GenericName[ast]=Sincronización de preseos GenericName[ca]=Sincronització de dispositius GenericName[ca@valencia]=Sincronització de dispositius GenericName[cs]=Synchronizace zařízení @@ -78,7 +76,6 @@ GenericName[zh_CN]=设备同步 GenericName[zh_TW]=設備同步 Comment=Make all your devices one Comment[ar]=اجعل أجهزتك كلّها واحدًا -Comment[ast]=Fai tolos tos preseos ún Comment[ca]=Fa que tots els vostres dispositius siguin un Comment[ca@valencia]=Fa que tots els vostres dispositius siguen un Comment[cs]=Sjednoťte svá zařízení diff --git a/daemon/kdeconnect.desktop b/daemon/kdeconnect.desktop index 30aee89d8..ef799d766 100644 --- a/daemon/kdeconnect.desktop +++ b/daemon/kdeconnect.desktop @@ -11,7 +11,6 @@ X-KDE-Kded-phase=1 Name=KDE Connect Name[ar]=كدي المتّصل -Name[ast]=KDE Connect Name[bg]=KDE Connect Name[bs]=Konekcija KDE Name[ca]=KDE Connect @@ -53,7 +52,6 @@ Name[zh_TW]=KDE 連線 Comment=Connect KDE with your smartphone Comment[ar]=أوصل كدي بهاتفك الذّكيّ -Comment[ast]=Coneuta KDE col to teléfonu intelixente Comment[bg]=Свържете КДЕ с вашия смартфон Comment[bs]=Konektujte se na KDE sa Vašim mobitelom Comment[ca]=Connecta el KDE amb el vostre telèfon intel·ligent diff --git a/daemon/kdeconnectd.desktop.cmake b/daemon/kdeconnectd.desktop.cmake index aaaa14b83..862d2fff8 100644 --- a/daemon/kdeconnectd.desktop.cmake +++ b/daemon/kdeconnectd.desktop.cmake @@ -9,7 +9,6 @@ NoDisplay=true Name=KDEConnect daemon Name[ar]=عفريت KDEConnect -Name[ast]=Degorriu KDEConnect Name[bg]=Услуга KDE Connect Name[ca]=Dimoni del KDEConnect Name[ca@valencia]=Dimoni del KDEConnect diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index a47536efd..205cc6df4 100644 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -33,7 +33,6 @@ Name[zh_CN]=KDE Connect 指示器 Name[zh_TW]=KDE 連線指示符號 Comment=Display information about your devices Comment[ar]=اعرض معلومات عن أجهزتك -Comment[ast]=Amuesa información tocante a los tos preseos Comment[ca]=Mostra la informació dels vostres dispositius Comment[ca@valencia]=Mostra la informació dels vostres dispositius Comment[cs]=Zobrazit informace o vašich zařízeních diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index f487a89b9..7774c2cb4 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -12,7 +12,6 @@ X-KDE-System-Settings-Parent-Category=hardware Name=KDE Connect Name[ar]=كدي المتّصل -Name[ast]=KDE Connect Name[bg]=KDE Connect Name[bs]=Konekcija KDE Name[ca]=KDE Connect @@ -54,7 +53,6 @@ Name[zh_TW]=KDE 連線 Comment=Connect and sync your devices Comment[ar]=اتّصل وزامن أجهزتك -Comment[ast]=Coneuta y sincroniza los tos preseos Comment[ca]=Connecta i sincronitza els vostres dispositius Comment[ca@valencia]=Connecta i sincronitza els vostres dispositius Comment[cs]=Připojte a synchronizujte svá zařízení @@ -93,7 +91,6 @@ Comment[zh_TW]=連線並且同步您的裝置 X-KDE-Keywords=Network,Android,Devices X-KDE-Keywords[ar]=شبكة,أندرويد,اندرويد,جهاز,أجهزة -X-KDE-Keywords[ast]=Rede,Android,Preseos X-KDE-Keywords[bg]=Мрежа,Андроид,Устройства X-KDE-Keywords[bs]=Mreža,Android,Uređaji X-KDE-Keywords[ca]=Xarxa,Android,Dispositius diff --git a/kcm/org.kde.kdeconnect.kcm.desktop b/kcm/org.kde.kdeconnect.kcm.desktop index e4c4e7160..6e9d653b3 100755 --- a/kcm/org.kde.kdeconnect.kcm.desktop +++ b/kcm/org.kde.kdeconnect.kcm.desktop @@ -5,7 +5,6 @@ Terminal=false Exec=kcmshell5 kcm_kdeconnect Name=KDE Connect Settings Name[ar]=إعدادات كدي المتّصل -Name[ast]=Axustes de KDE Connect Name[ca]=Arranjament del KDE Connect Name[ca@valencia]=Arranjament del KDE Connect Name[cs]=Nastavení KDE Connect @@ -43,7 +42,6 @@ Name[zh_CN]=KDE Connect 设置 Name[zh_TW]=KDE 連線設定 GenericName=Connect and sync your devices GenericName[ar]=اتّصل وزامن أجهزتك -GenericName[ast]=Coneuta y sincroniza los tos preseos GenericName[ca]=Connecta i sincronitza els vostres dispositius GenericName[ca@valencia]=Connecta i sincronitza els vostres dispositius GenericName[cs]=Připojte a synchronizujte svá zařízení diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index 8aa87fac1..5ff4e6122 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Name=KDE Connect Name[ar]=كدي المتّصل -Name[ast]=KDE Connect Name[bg]=KDE Connect Name[bs]=Konekcija KDE Name[ca]=KDE Connect @@ -42,7 +41,6 @@ Name[zh_CN]=KDE Connect Name[zh_TW]=KDE 連線 Comment=Show notifications from your devices using KDE Connect Comment[ar]=أظهر الإخطارات من أجهزتك باستخدام «كدي المتّصل» -Comment[ast]=Amuesa avisos de los tos preseos qu'usen KDE Connect Comment[bg]=Показване на уведомления от вашите устройства чрез KDE Connect Comment[bs]=Prikaži obavlještenja sa uređaja koji koriste KDE konekciju Comment[ca]=Mostra les notificacions dels vostres dispositius emprant el KDE Connect diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 664808409..895f9a20b 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -2,7 +2,6 @@ IconName=kdeconnect Name=KDE Connect Name[ar]=كدي المتّصل -Name[ast]=KDE Connect Name[bg]=KDE Connect Name[bs]=Konekcija KDE Name[ca]=KDE Connect @@ -43,7 +42,6 @@ Name[zh_CN]=KDE Connect Name[zh_TW]=KDE 連線 Comment=Notifications from your devices Comment[ar]=الإخطارات من أجهزتك -Comment[ast]=Avisos de los tos preseos Comment[bg]=Уведомления от устройствата ви Comment[bs]=Notifikacija sa Vašeg uređaja Comment[ca]=Notificacions dels vostres dispositius @@ -86,7 +84,6 @@ Comment[zh_TW]=從您的裝置接收到通知 [Event/pairingRequest] Name=Pairing Request Name[ar]=طلب اقتران -Name[ast]=Solicitú d'empareyamientu Name[bg]=Заявка за сдвояване Name[bs]=Zahtjev za uparivanje Name[ca]=Sol·licitud d'aparellament @@ -126,7 +123,6 @@ Name[zh_CN]=配对请求 Name[zh_TW]=配對請求 Comment=Pairing request received from a device Comment[ar]=استُلم طلب اقتران من جهاز -Comment[ast]=Recibióse una solicitú d'empareyamientu 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[cs]=Požadavek na párování přijat ze zařízení @@ -166,7 +162,6 @@ Action=Popup [Event/callReceived] Name=Incoming Call Name[ar]=مكالمة واردة -Name[ast]=Llamada entrante Name[bg]=Входящо обаждане Name[ca]=Trucada entrant Name[ca@valencia]=Trucada entrant @@ -206,7 +201,6 @@ Name[zh_CN]=收到呼叫 Name[zh_TW]=電話來電 Comment=Someone is calling you Comment[ar]=ثمّة من يتّصل بك -Comment[ast]=Daquién ta llamándote Comment[bg]=Някой ви се обажда Comment[bs]=Neko Vas zove Comment[ca]=Algú us està trucant @@ -250,7 +244,6 @@ Action=Popup [Event/missedCall] Name=Missed Call Name[ar]=مكالمة فائتة -Name[ast]=Llamada perdida Name[bg]=Пропуснато обаждане Name[ca]=Trucada perduda Name[ca@valencia]=Trucada perduda @@ -289,7 +282,6 @@ Name[zh_CN]=未接来电 Name[zh_TW]=未接來電 Comment=You have a missed call Comment[ar]=لقد فاتتك مكالمة -Comment[ast]=Tienes una llamada perdida Comment[bg]=Имате неприето обаждане Comment[bs]=Imate propušten poziv Comment[ca]=Teniu una trucada perduda @@ -333,7 +325,6 @@ Action=Popup [Event/smsReceived] Name=SMS Received Name[ar]=استُلمت رسالة -Name[ast]=SMS recibíu Name[bg]=Получен SMS Name[ca]=S'ha rebut un SMS Name[ca@valencia]=S'ha rebut un SMS @@ -372,7 +363,6 @@ Name[zh_CN]=收到短信 Name[zh_TW]=您有收到短訊 Comment=Someone sent you an SMS Comment[ar]=ثمّة من أرسل رسالة إليك -Comment[ast]=Daquién unvióte un SMS Comment[bg]=Някой ви изпрати текстово съобщение Comment[bs]=Neko Vam je poslao SMS poruku Comment[ca]=Algú us ha enviat un SMS @@ -416,7 +406,6 @@ Action=Popup [Event/batteryLow] Name=Battery Low Name[ar]=البطّاريّة ضعيفة -Name[ast]=Batería baxa Name[bg]=Изтощена батерия Name[ca]=Bateria baixa Name[ca@valencia]=Bateria baixa @@ -455,7 +444,6 @@ Name[zh_CN]=电池电量低 Name[zh_TW]=電池低電量 Comment=Your battery is in low state Comment[ar]=بطّاريّتك في الحالة الضعيفة -Comment[ast]=La to batería ta escosándose Comment[bg]=Батерията ви е с нисък заряд Comment[bs]=Vaša baterija je gotovo prazna Comment[ca]=La bateria està baixa @@ -499,7 +487,6 @@ Action=Popup [Event/pingReceived] Name=Ping Received Name[ar]=استُلمت وكزة -Name[ast]=Ping recibíu Name[bg]=Пингът е приет Name[ca]=S'ha rebut un ping Name[ca@valencia]=S'ha rebut un ping @@ -538,7 +525,6 @@ Name[zh_CN]=收到 Ping Name[zh_TW]=收到Ping回應 Comment=Ping received Comment[ar]=استُلمت وكزة -Comment[ast]=Recibióse un ping Comment[bg]=Пингът е приет Comment[bs]=Primili ste ping Comment[ca]=S'ha rebut un ping @@ -582,7 +568,6 @@ Action=Popup [Event/notification] Name=Generic Notification Name[ar]=إخطار عموميّ -Name[ast]=Avisu xenéricu Name[bg]=Общо уведомление Name[ca]=Notificació genèrica Name[ca@valencia]=Notificació genèrica @@ -621,7 +606,6 @@ Name[zh_CN]=常规通知 Name[zh_TW]=通用通知 Comment=Notification received Comment[ar]=استُلم إخطار -Comment[ast]=Recibióse un avisu Comment[bg]=Уведомлението е прието Comment[bs]=Primjeno obavještenje Comment[ca]=Notificació rebuda @@ -665,7 +649,6 @@ Action=Popup [Event/transferReceived] Name=File Transfer Name[ar]=نقل الملفّات -Name[ast]=Tresferencia de ficheros Name[bg]=Прехвърляне на файл Name[ca]=Transferència de fitxers Name[ca@valencia]=Transferència de fitxers @@ -705,7 +688,6 @@ Name[zh_CN]=文件传送 Name[zh_TW]=檔案傳輸 Comment=Incoming file Comment[ar]=ملفّ قادم -Comment[ast]=Ficheru entrante Comment[bg]=Входящ файл Comment[ca]=Fitxer entrant Comment[ca@valencia]=Fitxer entrant diff --git a/plugins/kdeconnect_plugin.desktop b/plugins/kdeconnect_plugin.desktop index b31fe1914..cba0aba6e 100644 --- a/plugins/kdeconnect_plugin.desktop +++ b/plugins/kdeconnect_plugin.desktop @@ -4,7 +4,6 @@ X-KDE-ServiceType=KdeConnect/Plugin X-KDE-Derived=KPluginInfo Name=KDEConnect Plugin Name[ar]=ملحقة KDEConnect -Name[ast]=Complementu de KDEConnect Name[bg]=Приставка на KDEConnect Name[bs]=Priključak za KDE konekciju Name[ca]=Connector del KDE Connect diff --git a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop index 9df5e5469..2812e46f5 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop +++ b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop @@ -7,7 +7,6 @@ X-KDE-ParentComponents=kdeconnect_pausemusic Name=Pause Music plugin settings Name[ar]=إعدادات ملحقة إلباث الموسيقى -Name[ast]=Axustes del complementu de posar música Name[bg]=Настройки на приставката за поставяне на пауза Name[bs]=Zaustavi Muziku postavke dodatka Name[ca]=Ajustaments del connector Pausa la música diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop index 367ab4c28..4d1d66892 100644 --- a/plugins/runcommand/kdeconnect_runcommand_config.desktop +++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop @@ -7,7 +7,6 @@ X-KDE-ParentComponents=kdeconnect_runcommand Name=Run Command plugin settings Name[ar]=إعدادات ملحقة تشغيل الأوامر -Name[ast]=Axustes del complementu d'execución de comandos Name[ca]=Ajustaments del connector Executa ordres Name[ca@valencia]=Ajustaments del connector Executa ordres Name[cs]=Nastavení modulu Spustit příkaz diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop index 6734033b2..c5f636604 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop +++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop @@ -7,7 +7,6 @@ X-KDE-ParentComponents=kdeconnect_sendnotifications 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í diff --git a/plugins/share/kdeconnect_share_config.desktop b/plugins/share/kdeconnect_share_config.desktop index cdd00b119..9aede2b6f 100644 --- a/plugins/share/kdeconnect_share_config.desktop +++ b/plugins/share/kdeconnect_share_config.desktop @@ -7,7 +7,6 @@ X-KDE-ParentComponents=kdeconnect_share Name=Share plugin settings Name[ar]=إعدادات ملحقة المشاركة -Name[ast]=Axustes del complementu de compartición Name[bg]=Настройки на приставката за споделяне Name[bs]=Podijeli postavke dodatka Name[ca]=Ajustaments del connector Compartició diff --git a/plugins/sms/kdeconnect_sms.json b/plugins/sms/kdeconnect_sms.json index fda03a5b3..7b1babccc 100644 --- a/plugins/sms/kdeconnect_sms.json +++ b/plugins/sms/kdeconnect_sms.json @@ -11,6 +11,7 @@ "Description[ca@valencia]": "Envia i rep SMS", "Description[ca]": "Envia i rep SMS", "Description[cs]": "Posílat a přijímat SMS", + "Description[de]": "Senden und Empfangen von SMS", "Description[es]": "Enviar y recibir SMS", "Description[fr]": "Envoyer et recevoir des SMS", "Description[it]": "Invia e ricevi SMS", @@ -21,12 +22,14 @@ "Description[sv]": "Skicka och ta emot SMS", "Description[uk]": "Надсилання і отримання SMS", "Description[x-test]": "xxSend and receive SMSxx", + "Description[zh_CN]": "发送和接收短信", "EnabledByDefault": true, "Icon": "mail-message-new-list", "Id": "kdeconnect_sms", "License": "GPL", "Name": "SMS", "Name[x-test]": "xxSMSxx", + "Name[zh_CN]": "短信", "ServiceTypes": [ "KdeConnect/Plugin" ], diff --git a/plugins/systemvolume/kdeconnect_systemvolume.json b/plugins/systemvolume/kdeconnect_systemvolume.json index 8dadfb252..2aa0292aa 100644 --- a/plugins/systemvolume/kdeconnect_systemvolume.json +++ b/plugins/systemvolume/kdeconnect_systemvolume.json @@ -23,6 +23,7 @@ "Description[sv]": "Kontrollera systemvolymen från telefonen", "Description[uk]": "Керування системним томом з вашого телефону", "Description[x-test]": "xxControl the system volume from your phonexx", + "Description[zh_CN]": "用手机控制电脑音量", "EnabledByDefault": true, "Icon": "audio-volume-high", "Id": "kdeconnect_systemvolume", @@ -42,6 +43,7 @@ "Name[sv]": "Systemvolym", "Name[uk]": "Системний том", "Name[x-test]": "xxSystem volumexx", + "Name[zh_CN]": "系统音量", "ServiceTypes": [ "KdeConnect/Plugin" ], diff --git a/sfos/kdeconnect-sfos.desktop b/sfos/kdeconnect-sfos.desktop index 48417a9bd..7f0ca5687 100644 --- a/sfos/kdeconnect-sfos.desktop +++ b/sfos/kdeconnect-sfos.desktop @@ -5,7 +5,6 @@ Icon=kdeconnect Exec=kdeconnect-sfos Name=KDE Connect Name[ar]=كدي المتّصل -Name[ast]=KDE Connect Name[bg]=KDE Connect Name[bs]=Konekcija KDE Name[ca]=KDE Connect diff --git a/sfos/kdeconnectd.desktop.cmake b/sfos/kdeconnectd.desktop.cmake index aaaa14b83..862d2fff8 100644 --- a/sfos/kdeconnectd.desktop.cmake +++ b/sfos/kdeconnectd.desktop.cmake @@ -9,7 +9,6 @@ NoDisplay=true Name=KDEConnect daemon Name[ar]=عفريت KDEConnect -Name[ast]=Degorriu KDEConnect Name[bg]=Услуга KDE Connect Name[ca]=Dimoni del KDEConnect Name[ca@valencia]=Dimoni del KDEConnect