From ccde0558d53fce26c12fa16e2203c605c992adf9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 7 Dec 2020 09:52:48 +0100 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 | 4 ++-- daemon/org.kde.kdeconnect.daemon.desktop.cmake | 2 +- data/kdeconnect-dde.desktop | 2 +- data/kdeconnect-thunar.desktop | 2 +- data/org.kde.kdeconnect_open.desktop | 6 +++--- fileitemactionplugin/kdeconnectsendfile.json | 4 ++-- indicator/org.kde.kdeconnect.nonplasma.desktop | 4 ++-- kcm/kcm_kdeconnect.desktop | 2 +- plasmoid/package/metadata.desktop | 4 ++-- .../findthisdevice/kdeconnect_findthisdevice_config.desktop | 2 +- plugins/kdeconnect.notifyrc | 6 +++--- plugins/kdeconnect_plugin.desktop | 2 +- plugins/pausemusic/kdeconnect_pausemusic_config.desktop | 2 +- plugins/runcommand/kdeconnect_runcommand_config.desktop | 2 +- .../kdeconnect_sendnotifications_config.desktop | 2 +- plugins/share/kdeconnect_share_config.desktop | 2 +- settings/org.kde.kdeconnect.settings.desktop | 2 +- smsapp/org.kde.kdeconnect.sms.desktop | 2 +- urlhandler/org.kde.kdeconnect.handler.desktop | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop index 301f9711e..5d430fbe4 100644 --- a/app/org.kde.kdeconnect.app.desktop +++ b/app/org.kde.kdeconnect.app.desktop @@ -43,7 +43,7 @@ Name[sv]=KDE-anslut Name[tr]=KDE Connect Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx -Name[zh_CN]=KDE Connect +Name[zh_CN]=K 易连 Name[zh_TW]=KDE 連線 GenericName=Device Synchronization GenericName[ar]=مزامنة الأجهزة @@ -127,7 +127,7 @@ Comment[sv]=Gör alla enheter till en Comment[tr]=Tüm aygıtlarınızı birleştirin Comment[uk]=Поєднайте усі ваші пристрої Comment[x-test]=xxMake all your devices onexx -Comment[zh_CN]=连接您所有设备 +Comment[zh_CN]=将您的所有设备合而为一 Comment[zh_TW]=讓您的裝置內容全面同步 Exec=kdeconnect-app Icon=kdeconnect diff --git a/daemon/org.kde.kdeconnect.daemon.desktop.cmake b/daemon/org.kde.kdeconnect.daemon.desktop.cmake index 959b715af..6ab5e2400 100644 --- a/daemon/org.kde.kdeconnect.daemon.desktop.cmake +++ b/daemon/org.kde.kdeconnect.daemon.desktop.cmake @@ -53,5 +53,5 @@ Name[sv]=KDE-anslut Name[tr]=KDE Connect Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx -Name[zh_CN]=KDE Connect +Name[zh_CN]=K 易连 Name[zh_TW]=KDE 連線 diff --git a/data/kdeconnect-dde.desktop b/data/kdeconnect-dde.desktop index ad61a8984..5a37cf227 100644 --- a/data/kdeconnect-dde.desktop +++ b/data/kdeconnect-dde.desktop @@ -37,6 +37,6 @@ Name[sl]=Pošlji prek KDE Connect Name[sv]=Skicka via KDE-anslut Name[uk]=Надіслати за допомогою KDE Connect Name[x-test]=xxSend via KDE Connectxx -Name[zh_CN]=通过 KDE Connect 发送 +Name[zh_CN]=通过 K 易连发送 Name[zh_TW]=使用 KDE 連線傳送 X-DFM-MenuTypes=SingleFile;MultiFileDirs; diff --git a/data/kdeconnect-thunar.desktop b/data/kdeconnect-thunar.desktop index b20db7d5d..775388154 100644 --- a/data/kdeconnect-thunar.desktop +++ b/data/kdeconnect-thunar.desktop @@ -37,5 +37,5 @@ Name[sl]=Pošlji prek KDE Connect Name[sv]=Skicka via KDE-anslut Name[uk]=Надіслати за допомогою KDE Connect Name[x-test]=xxSend via KDE Connectxx -Name[zh_CN]=通过 KDE Connect 发送 +Name[zh_CN]=通过 K 易连发送 Name[zh_TW]=使用 KDE 連線傳送 diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop index 233c4a9c9..3b797050e 100644 --- a/data/org.kde.kdeconnect_open.desktop +++ b/data/org.kde.kdeconnect_open.desktop @@ -31,7 +31,7 @@ GenericName[sl]=Odpri na povezani napravi prek KDE Connect GenericName[sv]=Visa på ansluten apparat via KDE-anslut GenericName[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect GenericName[x-test]=xxOpen on connected device via KDE Connectxx -GenericName[zh_CN]=通过 KDE Connect 在已连接的设备上打开 +GenericName[zh_CN]=通过 K 易连在已连接的设备上打开 GenericName[zh_TW]=使用 KDE 連線於連線裝置中開啟 Name=Open on connected device via KDE Connect Name[az]=Connectd cihazında KDE Connect ilə açmaq @@ -65,7 +65,7 @@ Name[sl]=Odpri na povezani napravi prek KDE Connect Name[sv]=Visa på ansluten apparat via KDE-anslut Name[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect Name[x-test]=xxOpen on connected device via KDE Connectxx -Name[zh_CN]=通过 KDE Connect 在已连接的设备上打开 +Name[zh_CN]=通过 K 易连在已连接的设备上打开 Name[zh_TW]=使用 KDE 連線於連線裝置中開啟 Comment=Open on a connected device using KDE Connect Comment[az]=Connectd cihazında KDE Connect istifadə edərək açmaq @@ -98,7 +98,7 @@ Comment[sl]=Odpri na povezani napravi z uporabo KDE Connect Comment[sv]=Visa på en ansluten apparat med användning av KDE-anslut Comment[uk]=Відкрити на з'єднаному пристрої за допомогою KDE Connect Comment[x-test]=xxOpen on a connected device using KDE Connectxx -Comment[zh_CN]=通过 KDE Connect 在已连接的设备上打开 +Comment[zh_CN]=通过 K 易连在已连接的设备上打开 Comment[zh_TW]=使用 KDE 連線於連線裝置中開啟 MimeType=application/octet-stream; Exec=kdeconnect-handler --open %U diff --git a/fileitemactionplugin/kdeconnectsendfile.json b/fileitemactionplugin/kdeconnectsendfile.json index 359771df6..aee662a90 100644 --- a/fileitemactionplugin/kdeconnectsendfile.json +++ b/fileitemactionplugin/kdeconnectsendfile.json @@ -31,7 +31,7 @@ "Description[sv]": "Skicka fil till en annan enhet med användning av KDE:s anslutningstjänst", "Description[uk]": "Надіслати файл на інший пристрій за допомогою KDE Connect", "Description[x-test]": "xxSend file to other device using KDE Connectxx", - "Description[zh_CN]": "使用 KDE Connect 将文件发送到其他设备", + "Description[zh_CN]": "使用 K 易连将文件发送到其他设备", "Description[zh_TW]": "使用 KDE 連線傳送檔案至其他裝置", "Icon": "kdeconnect", "License": "GPL", @@ -69,7 +69,7 @@ "Name[sv]": "Skicka fil via KDE:s anslutningstjänst", "Name[uk]": "Надіслати файл за допомогою KDE Connect", "Name[x-test]": "xxSend file via KDE Connectxx", - "Name[zh_CN]": "通过 KDE Connect 发送文件", + "Name[zh_CN]": "通过 K 易连发送文件", "Name[zh_TW]": "使用 KDE 連線傳送檔案", "ServiceTypes": [ "KFileItemAction/Plugin" diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index 7b38eb5b3..14bd7c653 100644 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -36,7 +36,7 @@ Name[sv]=KDE-anslut indikator Name[tr]=KDE Connect Göstergesi Name[uk]=Індикатор KDE Connect Name[x-test]=xxKDE Connect Indicatorxx -Name[zh_CN]=KDE Connect 指示器 +Name[zh_CN]=K 易连指示器 Name[zh_TW]=KDE 連線指示符號 Comment=Display information about your devices Comment[ar]=اعرض معلومات عن أجهزتك @@ -77,7 +77,7 @@ Comment[sv]=Visa information om enheter Comment[tr]=Aygıtlarınız hakkında bilgi görüntüleyin Comment[uk]=Показати дані щодо ваших пристроїв Comment[x-test]=xxDisplay information about your devicesxx -Comment[zh_CN]=显示您设备的信息 +Comment[zh_CN]=显示设备信息 Comment[zh_TW]=顯示關於您的裝置資訊 Exec=kdeconnect-indicator Icon=kdeconnect diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index 134c5da4f..b9cd86c08 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -54,7 +54,7 @@ Name[sv]=KDE-anslut Name[tr]=KDE Connect Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx -Name[zh_CN]=KDE Connect +Name[zh_CN]=K 易连 Name[zh_TW]=KDE 連線 Comment=Connect and sync your devices diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index d5c1a524b..646e367ef 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -43,7 +43,7 @@ Name[sv]=KDE-anslut Name[tr]=KDE Connect Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx -Name[zh_CN]=KDE Connect +Name[zh_CN]=K 易连 Name[zh_TW]=KDE 連線 Comment=Show notifications from your devices using KDE Connect Comment[ar]=أظهر الإخطارات من أجهزتك باستخدام «كدي المتّصل» @@ -88,7 +88,7 @@ Comment[sv]=Visa underrättelser från apparater med KDE anslut Comment[tr]=KDE Connect kullanılarak cihazınızdan bildirimleri görüntüleyin Comment[uk]=Показ сповіщень з ваших пристроїв за допомогою програми «З’єднання KDE» Comment[x-test]=xxShow notifications from your devices using KDE Connectxx -Comment[zh_CN]=通过 KDE Connect 显示来自您的设备的通知 +Comment[zh_CN]=通过 K 易连显示来自您的设备的通知 Comment[zh_TW]=使用 KDE 連線來顯示您的裝置通知 Icon=kdeconnect diff --git a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop index 9473120fb..43e1e4dc3 100644 --- a/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop +++ b/plugins/findthisdevice/kdeconnect_findthisdevice_config.desktop @@ -8,7 +8,7 @@ X-KDE-ParentComponents=kdeconnect_findthisdevice Name=Find This Device plugin settings Name[az]=Bu cihaz qoşması ayarlarını tapmaq Name[ca]=Configuració del connector Cerca aquest dispositiu -Name[ca@valencia]=Cerca els ajustaments d'aquest connector de dispositiu +Name[ca@valencia]=Configuració del connector Cerca aquest dispositiu Name[cs]=Nastavení modulu Najít toto zařízení Name[da]=Indstilling af find denne enhed-plugin Name[de]=Modul-Einstellungen diese Geräts suchen diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index e9f842938..c5c2f570b 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -44,7 +44,7 @@ Name[sv]=KDE-anslut Name[tr]=KDE Connect Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx -Name[zh_CN]=KDE Connect +Name[zh_CN]=K 易连 Name[zh_TW]=KDE 連線 Comment=Notifications from your devices Comment[ar]=الإخطارات من أجهزتك @@ -265,7 +265,7 @@ Comment[sv]=Någon ringer till dig Comment[tr]=Biri sizi arıyor Comment[uk]=Хтось телефонує вам Comment[x-test]=xxSomeone is calling youxx -Comment[zh_CN]=某人正在呼叫您 +Comment[zh_CN]=有人正在呼叫您 Comment[zh_TW]=有人打電話給您 Action=Popup @@ -312,7 +312,7 @@ Name[sv]=Missat samtal Name[tr]=Cevapsız Çağrı Name[uk]=Пропущений дзвінок Name[x-test]=xxMissed Callxx -Name[zh_CN]=错过的呼叫 +Name[zh_CN]=未接来电 Name[zh_TW]=未接來電 Comment=You have a missed call Comment[ar]=لقد فاتتك مكالمة diff --git a/plugins/kdeconnect_plugin.desktop b/plugins/kdeconnect_plugin.desktop index a5aa3b7cf..be46001bf 100644 --- a/plugins/kdeconnect_plugin.desktop +++ b/plugins/kdeconnect_plugin.desktop @@ -44,7 +44,7 @@ Name[sv]=KDE anslutningsinsticksprogram Name[tr]=KDEConnect Eklentisi Name[uk]=Додаток KDEConnect Name[x-test]=xxKDEConnect Pluginxx -Name[zh_CN]=KDEConnect 插件 +Name[zh_CN]=K 易连插件 Name[zh_TW]=KDE 連線外掛程式 # mandatory, list of all the package types supported diff --git a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop index 7610c5525..fc35e981a 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic_config.desktop +++ b/plugins/pausemusic/kdeconnect_pausemusic_config.desktop @@ -11,7 +11,7 @@ Name[az]=Musiqi qoşması ayarlarına fasilə Name[bg]=Настройки на приставката за поставяне на пауза Name[bs]=Zaustavi Muziku postavke dodatka Name[ca]=Configuració del connector Pausa a la música -Name[ca@valencia]=Ajustaments del connector Pausa a la música +Name[ca@valencia]=Configuració del connector Pausa a la música Name[cs]=Nastavení modulu Pozastavení hudby Name[da]=Indstilling af plugin til at sætte musik på pause Name[de]=Modul-Einstellungen für das Anhalten der Musikwiedergabe diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop index a417ffc93..c4ae8b71a 100644 --- a/plugins/runcommand/kdeconnect_runcommand_config.desktop +++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop @@ -10,7 +10,7 @@ Name[ar]=إعدادات ملحقة تشغيل الأوامر Name[ast]=Axustes del comandu Execución de comandos Name[az]=Əmr qoşması ayarlarını başlatmaq Name[ca]=Configuració del connector Executa ordres -Name[ca@valencia]=Ajustaments del connector Executa ordres +Name[ca@valencia]=Configuració del connector Executa ordres Name[cs]=Nastavení modulu Spustit příkaz Name[da]=Indstilling af kør kommando-plugin Name[de]=Modul-Einstellungen für Befehlsausführung diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop index f55f6aa6f..a28479134 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop +++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop @@ -9,7 +9,7 @@ Name=Notification synchronization plugin settings Name[ar]=إعدادات ملحقة مزامنة الإخطارات Name[az]=Bildiriş eyniləşdirmə qoşması ayarları Name[ca]=Configuració del connector Sincronitza les notificacions -Name[ca@valencia]=Ajustament del connector Sincronitza les notificacions +Name[ca@valencia]=Configuració del connector Sincronitza les notificacions Name[cs]=Nastavení modulu synchronizace upozornění Name[da]=Indstilling af plugin til bekendtgørelsessynkronisering Name[de]=Einstellungen für Benachrichtigungsabgleich-Modul diff --git a/plugins/share/kdeconnect_share_config.desktop b/plugins/share/kdeconnect_share_config.desktop index a8bca673b..b50fb01b0 100644 --- a/plugins/share/kdeconnect_share_config.desktop +++ b/plugins/share/kdeconnect_share_config.desktop @@ -11,7 +11,7 @@ Name[az]=Qoşma ayarlarını paylaşmaq Name[bg]=Настройки на приставката за споделяне Name[bs]=Podijeli postavke dodatka Name[ca]=Configuració del connector Compartició -Name[ca@valencia]=Ajustaments del connector Compartició +Name[ca@valencia]=Configuració del connector Compartició Name[cs]=Nastavení modulu sdílení Name[da]=Indstilling af deling-plugin Name[de]=Modul-Einstellungen für Veröffentlichung diff --git a/settings/org.kde.kdeconnect.settings.desktop b/settings/org.kde.kdeconnect.settings.desktop index d26379831..fdb1e960c 100755 --- a/settings/org.kde.kdeconnect.settings.desktop +++ b/settings/org.kde.kdeconnect.settings.desktop @@ -44,7 +44,7 @@ Name[sv]=Inställning av KDE-anslut Name[tr]=KDE Connect Ayarları Name[uk]=Параметри KDE Connect Name[x-test]=xxKDE Connect Settingsxx -Name[zh_CN]=KDE Connect设置 +Name[zh_CN]=K 易连设置 Name[zh_TW]=KDE 連線設定 GenericName=Connect and sync your devices GenericName[ar]=اتّصل وزامن أجهزتك diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop index eb2e2a90c..71a25107d 100644 --- a/smsapp/org.kde.kdeconnect.sms.desktop +++ b/smsapp/org.kde.kdeconnect.sms.desktop @@ -33,7 +33,7 @@ Name[sl]=KDE Connect SMS Name[sv]=KDE-anslut SMS Name[uk]=KDE Connect SMS Name[x-test]=xxKDE Connect SMSxx -Name[zh_CN]=KDE Connect 短信 +Name[zh_CN]=K 易连短信 Name[zh_TW]=KDE 連線簡訊 GenericName=SMS GenericName[ast]=SMS diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop index c441a65b0..4a443c481 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -28,7 +28,7 @@ Name[sl]=Upravitelj naslovov KDE Connect Name[sv]=KDE-anslut webbadresshanterare Name[uk]=Обробник адрес KDE Connect Name[x-test]=xxKDE Connect URL Handlerxx -Name[zh_CN]=KDE Connect URL 处理程序 +Name[zh_CN]=K 易连 URL 处理程序 Exec=kdeconnect-handler %U Icon=kdeconnect Type=Application