From d389cde75f651bad85bcabd10ea9fa2cc8d9ba6a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 24 Jan 2018 05:14:14 +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" --- applets/appmenu/package/metadata.desktop | 2 -- applets/batterymonitor/package/metadata.desktop | 1 - applets/calendar/package/metadata.desktop | 1 - applets/clipboard/metadata.desktop | 2 -- applets/digital-clock/package/metadata.desktop | 1 - applets/systemmonitor/cpu/metadata.desktop | 2 -- applets/systemtray/container/package/metadata.desktop | 1 - components/shellprivate/widgetexplorer/plasmoids.knsrc | 1 - dataengines/akonadi/plasma-engine-akonadi.desktop | 1 - dataengines/share/backends/pasteopensuseorg/metadata.desktop | 2 +- kioslave/desktop/Home.desktop | 2 -- kioslave/desktop/desktopnotifier.desktop | 2 -- kioslave/desktop/directory.trash | 2 -- klipper/klipper.desktop | 4 ++-- klipper/klipperrc.desktop | 2 +- klipper/org.kde.klipper.desktop | 4 ++-- klipper/plasma-dataengine-clipboard.desktop | 2 -- krunner/krunner.desktop | 2 +- lookandfeel/metadata.desktop | 1 - menu/desktop/kf5-toys.directory | 1 - menu/desktop/kf5-utilities-pim.directory | 2 -- phonon/platform_kde/phonon.notifyrc | 1 - plasma-windowed/plasma-windowed.desktop | 2 -- runners/appstream/appstreamrunner.desktop | 2 -- runners/baloo/plasma-runner-baloosearch.desktop | 1 - runners/powerdevil/plasma-runner-powerdevil.desktop | 1 - .../qmlWallpaper/plasma-packagestructure-wallpaper.desktop | 1 - .../shell/plasma-packagestructure-plasma-shell.desktop | 1 - .../plasma-packagestructure-wallpaperimages.desktop | 1 - 29 files changed, 7 insertions(+), 41 deletions(-) diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop index afb7dcd23..3cf588fc7 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Encoding=UTF-8 Name=Global Menu -Name[ar]=القائمة العموميّة Name[ca]=Menú global Name[ca@valencia]=Menú global Name[cs]=Globální nabídka @@ -39,7 +38,6 @@ Name[x-test]=xxGlobal Menuxx Name[zh_CN]=全局菜单 Name[zh_TW]=全域選單 Comment=Global menubar on top of the screen -Comment[ar]=شريط القوائم العموميّ أعلى الشّاشة Comment[ca]=Barra de menús global a la part superior de la pantalla Comment[ca@valencia]=Barra de menús global a la part superior de la pantalla Comment[de]=Globale Menüleiste oben auf dem Bildschirm diff --git a/applets/batterymonitor/package/metadata.desktop b/applets/batterymonitor/package/metadata.desktop index 7b2803f51..42d140c55 100644 --- a/applets/batterymonitor/package/metadata.desktop +++ b/applets/batterymonitor/package/metadata.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Name=Battery and Brightness -Name[ar]=البطّاريّة والسّطوع Name[ca]=Bateria i lluminositat Name[ca@valencia]=Bateria i lluminositat Name[cs]=Baterie a Jas diff --git a/applets/calendar/package/metadata.desktop b/applets/calendar/package/metadata.desktop index 601c256ed..e02db31c5 100644 --- a/applets/calendar/package/metadata.desktop +++ b/applets/calendar/package/metadata.desktop @@ -78,7 +78,6 @@ Name[x-test]=xxCalendarxx Name[zh_CN]=日历 Name[zh_TW]=行事曆 Comment=Month display with your appointments and events -Comment[ar]=عرض للشّهر فيه المواعيد والأحداث Comment[ca]=Mostra el mes amb les cites i els esdeveniments Comment[ca@valencia]=Mostra el mes amb les cites i els esdeveniments Comment[da]=Månedsvisning med dine aftaler og begivenheder diff --git a/applets/clipboard/metadata.desktop b/applets/clipboard/metadata.desktop index 8535f2d8b..7209e7eaa 100644 --- a/applets/clipboard/metadata.desktop +++ b/applets/clipboard/metadata.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Name=Clipboard -Name[ar]=الحافظة Name[bs]=Klipbord Name[ca]=Porta-retalls Name[ca@valencia]=Porta-retalls @@ -45,7 +44,6 @@ Name[x-test]=xxClipboardxx Name[zh_CN]=剪贴板 Name[zh_TW]=剪貼簿 Comment=Provides access to the clipboard history -Comment[ar]=اطّلع على تاريخ الحافظة Comment[ca]=Proporciona accés a l'historial del porta-retalls Comment[ca@valencia]=Proporciona accés a l'historial del porta-retalls Comment[cs]=Poskytuje přístup k historii schránky diff --git a/applets/digital-clock/package/metadata.desktop b/applets/digital-clock/package/metadata.desktop index 53445ab54..a2c69f9ab 100644 --- a/applets/digital-clock/package/metadata.desktop +++ b/applets/digital-clock/package/metadata.desktop @@ -87,7 +87,6 @@ Name[zh_CN]=数字钟 Name[zh_TW]=數位時鐘 Comment=Time displayed in a digital format -Comment[ar]=الوقت بتنسيق رقميّ Comment[bs]=Vrijeme prikazano u digitalnom obliku Comment[ca]=Mostra l'hora en un format digital Comment[ca@valencia]=Mostra l'hora en un format digital diff --git a/applets/systemmonitor/cpu/metadata.desktop b/applets/systemmonitor/cpu/metadata.desktop index 40a94f1cf..bc2245285 100644 --- a/applets/systemmonitor/cpu/metadata.desktop +++ b/applets/systemmonitor/cpu/metadata.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Encoding=UTF-8 Name=CPU Load Monitor -Name[ar]=مرقاب حِمل المعالج Name[ca]=Controlador de càrrega de la CPU Name[ca@valencia]=Controlador de càrrega de la CPU Name[cs]=Monitor zatížení CPU @@ -42,7 +41,6 @@ Name[x-test]=xxCPU Load Monitorxx Name[zh_CN]=CPU 负载监视器 Name[zh_TW]=CPU 負載監視器 Comment=Monitor the load of the CPUs -Comment[ar]=راقِب حِمل المعالجات لديك Comment[ca]=Controla la càrrega de les CPU Comment[ca@valencia]=Controla la càrrega de les CPU Comment[cs]=Monitorovat zatížení procesor(ů) diff --git a/applets/systemtray/container/package/metadata.desktop b/applets/systemtray/container/package/metadata.desktop index 03956b6be..63bea127c 100644 --- a/applets/systemtray/container/package/metadata.desktop +++ b/applets/systemtray/container/package/metadata.desktop @@ -87,7 +87,6 @@ Name[x-test]=xxSystem Trayxx Name[zh_CN]=系统托盘 Name[zh_TW]=系統匣 Comment=Access hidden applications minimized in the system tray -Comment[ar]=توصّل إلى التّطبيقات المصغّرة في صينيّة النظامّ Comment[be@latin]=Dostup da schavanych u systemnym trei aplikacyjaŭ Comment[bg]=Достъп до минимизираните в системния панел програми Comment[bs]=Pristup skrivenim programima minimizovanim u sistemsku kasetu diff --git a/components/shellprivate/widgetexplorer/plasmoids.knsrc b/components/shellprivate/widgetexplorer/plasmoids.knsrc index 5fff76147..730f95065 100644 --- a/components/shellprivate/widgetexplorer/plasmoids.knsrc +++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc @@ -1,6 +1,5 @@ [KNewStuff3] Name=Plasma Widgets -Name[ar]=ودجات بلازما Name[ca]=Estris del Plasma Name[ca@valencia]=Estris del Plasma Name[cs]=Widgety pro Plasmu diff --git a/dataengines/akonadi/plasma-engine-akonadi.desktop b/dataengines/akonadi/plasma-engine-akonadi.desktop index 5a7179845..e24799c7e 100644 --- a/dataengines/akonadi/plasma-engine-akonadi.desktop +++ b/dataengines/akonadi/plasma-engine-akonadi.desktop @@ -69,7 +69,6 @@ Name[x-test]=xxAkonadixx Name[zh_CN]=Akonadi Name[zh_TW]=Akonadi Comment=Akonadi PIM data engine -Comment[ar]=محرّك بيانات «مدير أكونادي للمعلومات الشّخصيّة» Comment[bg]=Ядро за данни Akonadi PIM Comment[bs]=PIM datomotor Akonadija Comment[ca]=Motor de dades PIM de l'Akonadi diff --git a/dataengines/share/backends/pasteopensuseorg/metadata.desktop b/dataengines/share/backends/pasteopensuseorg/metadata.desktop index 8c7ddf8d3..ee4f99d4c 100644 --- a/dataengines/share/backends/pasteopensuseorg/metadata.desktop +++ b/dataengines/share/backends/pasteopensuseorg/metadata.desktop @@ -59,7 +59,7 @@ Name[x-test]=xxpaste.opensuse.orgxx Name[zh_CN]=paste.opensuse.org Name[zh_TW]=paste.opensuse.org Comment=Paste text with openSUSE -Comment[ar]=ألصِق نصًّا بِأوبن سوزة +Comment[ar]=الصق نصًّا بـأوبن سوزي Comment[bg]=Поставяне на текст през openSUSE Comment[bs]=Opensuseov servis za naljepljivanje teksta Comment[ca]=Enganxa text amb openSUSE diff --git a/kioslave/desktop/Home.desktop b/kioslave/desktop/Home.desktop index 2c4d7d01e..9ad53f0b9 100644 --- a/kioslave/desktop/Home.desktop +++ b/kioslave/desktop/Home.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Encoding=UTF-8 Name=Home -Name[ar]=المنزل Name[ca]=Inici Name[ca@valencia]=Inici Name[cs]=Můj adresář @@ -43,7 +42,6 @@ Name[x-test]=xxHomexx Name[zh_CN]=主文件夹 Name[zh_TW]=家目錄 GenericName=Personal Files -GenericName[ar]=الملفّات الشّخصيّة GenericName[ca]=Fitxers personals GenericName[ca@valencia]=Fitxers personals GenericName[cs]=Osobní soubory diff --git a/kioslave/desktop/desktopnotifier.desktop b/kioslave/desktop/desktopnotifier.desktop index 2118e046b..48940f064 100644 --- a/kioslave/desktop/desktopnotifier.desktop +++ b/kioslave/desktop/desktopnotifier.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Type=Service Name=Directory Watcher -Name[ar]=مراقب الأدلّة Name[ca]=Vigilant de directori Name[ca@valencia]=Vigilant de directori Name[cs]=Sledovač adresářů @@ -49,7 +48,6 @@ X-KDE-DBus-ModuleName=desktopnotifier X-KDE-Kded-load-on-demand=true X-KDE-Kded-autoload=false Comment=Monitors directories for changes -Comment[ar]=راقب تغييرات الأدلّة Comment[ca]=Controla els canvis en els directoris Comment[ca@valencia]=Controla els canvis en els directoris Comment[cs]=Monitoruje změny v adresáři diff --git a/kioslave/desktop/directory.trash b/kioslave/desktop/directory.trash index 0d057b390..546497435 100644 --- a/kioslave/desktop/directory.trash +++ b/kioslave/desktop/directory.trash @@ -1,7 +1,6 @@ [Desktop Entry] Encoding=UTF-8 Name=Trash -Name[ar]=المهملات Name[ca]=Paperera Name[ca@valencia]=Paperera Name[cs]=Koš @@ -43,7 +42,6 @@ Name[x-test]=xxTrashxx Name[zh_CN]=回收站 Name[zh_TW]=資源回收筒 Comment=Contains removed files -Comment[ar]=تحتوي الملفّات المُزالة Comment[ca]=Conté els fitxers eliminats Comment[ca@valencia]=Conté els fitxers eliminats Comment[cs]=Obsahuje odstraněné soubory diff --git a/klipper/klipper.desktop b/klipper/klipper.desktop index ad1af7a4b..a511bdc7e 100644 --- a/klipper/klipper.desktop +++ b/klipper/klipper.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Klipper Name[af]=Klipper -Name[ar]=مقصّك +Name[ar]=مقصّ.ك Name[be]=Klipper Name[be@latin]=Klipper Name[bg]=Klipper @@ -90,7 +90,7 @@ Name[zh_CN]=Klipper Name[zh_TW]=剪貼薄(Klipper) GenericName=Clipboard Tool GenericName[af]=Klipbord Program -GenericName[ar]=أداة الحافظة +GenericName[ar]=أداة حافظة GenericName[be]=Буфер абмену GenericName[be@latin]=Pryłada, jakaja absłuhoŭvaje abmienny bufer GenericName[bg]=Системен буфер diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop index fdd3777d1..539b8948b 100644 --- a/klipper/klipperrc.desktop +++ b/klipper/klipperrc.desktop @@ -922,7 +922,7 @@ Regexp=^mailto:. Commandline=kmail --composer `echo %s | sed 's/mailto://g'` Description=Launch &Kmail Description[af]=Lanseer Kpos -Description[ar]=أطلِق بريد&ك +Description[ar]=أطلِق ب&ريد.ك Description[be]=Запусціць &KMail Description[be@latin]=Uklučy prahramu „&Kmail” Description[bg]=За&реждане на Kmail diff --git a/klipper/org.kde.klipper.desktop b/klipper/org.kde.klipper.desktop index 1bf73bc8c..226a308c5 100644 --- a/klipper/org.kde.klipper.desktop +++ b/klipper/org.kde.klipper.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Klipper Name[af]=Klipper -Name[ar]=مقصّك +Name[ar]=مقصّ.ك Name[be]=Klipper Name[be@latin]=Klipper Name[bg]=Klipper @@ -90,7 +90,7 @@ Name[zh_CN]=Klipper Name[zh_TW]=剪貼薄(Klipper) GenericName=Clipboard Tool GenericName[af]=Klipbord Program -GenericName[ar]=أداة الحافظة +GenericName[ar]=أداة حافظة GenericName[be]=Буфер абмену GenericName[be@latin]=Pryłada, jakaja absłuhoŭvaje abmienny bufer GenericName[bg]=Системен буфер diff --git a/klipper/plasma-dataengine-clipboard.desktop b/klipper/plasma-dataengine-clipboard.desktop index 2615e6e8a..dc5f99dad 100644 --- a/klipper/plasma-dataengine-clipboard.desktop +++ b/klipper/plasma-dataengine-clipboard.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Name=Clipboard -Name[ar]=الحافظة Name[bs]=Klipbord Name[ca]=Porta-retalls Name[ca@valencia]=Porta-retalls @@ -45,7 +44,6 @@ Name[x-test]=xxClipboardxx Name[zh_CN]=剪贴板 Name[zh_TW]=剪貼簿 Comment=Clipboard Tool. -Comment[ar]=أداة الحافظة. Comment[bs]=Klipbord alat. Comment[ca]=Eina de porta-retalls. Comment[ca@valencia]=Eina de porta-retalls. diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop index 09817e43f..dc8f58d27 100644 --- a/krunner/krunner.desktop +++ b/krunner/krunner.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Exec=krunner Name=KRunner -Name[ar]=مشغّلك +Name[ar]=مشغّل.ك Name[bs]=KPokretač Name[ca]=KRunner Name[ca@valencia]=KRunner diff --git a/lookandfeel/metadata.desktop b/lookandfeel/metadata.desktop index ac8b7b082..3d7679509 100644 --- a/lookandfeel/metadata.desktop +++ b/lookandfeel/metadata.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Comment=Breeze Desktop Design Language by the KDE VDG -Comment[ar]=لغة تصميم سطح المكتب «نسيم» من مجموعة تصاميم كدي المرئيّة Comment[bs]=Breeze jezik dizajna radne površine od strane KDE VDG Comment[ca]=Llenguatge de disseny d'escriptori Brisa pel VDG del KDE Comment[ca@valencia]=Llenguatge de disseny d'escriptori Brisa pel VDG del KDE diff --git a/menu/desktop/kf5-toys.directory b/menu/desktop/kf5-toys.directory index 6826b301e..f615b8f33 100644 --- a/menu/desktop/kf5-toys.directory +++ b/menu/desktop/kf5-toys.directory @@ -3,7 +3,6 @@ Encoding=UTF-8 Type=Directory Name=Toys Name[af]=Speelgoed -Name[ar]=اللُعب Name[as]=খেলনা Name[be]=Цацкі Name[be@latin]=Cacki diff --git a/menu/desktop/kf5-utilities-pim.directory b/menu/desktop/kf5-utilities-pim.directory index dec78b9ae..047dcf606 100644 --- a/menu/desktop/kf5-utilities-pim.directory +++ b/menu/desktop/kf5-utilities-pim.directory @@ -3,7 +3,6 @@ Encoding=UTF-8 Type=Directory Name=PIM Name[af]=PIM -Name[ar]=إدارة المعلومات الشّخصيّة Name[as]=PIM Name[be]=PIM Name[be@latin]=Ułasny arhanizatar @@ -90,7 +89,6 @@ Name[zh_TW]=PIM Icon=office-calendar Comment=PIM Comment[af]=Persoonlike Informasie Bestuurder -Comment[ar]=إدارة المعلومات الشّخصيّة Comment[as]=PIM Comment[be]=PIM Comment[be@latin]=Ułasny arhanizatar diff --git a/phonon/platform_kde/phonon.notifyrc b/phonon/platform_kde/phonon.notifyrc index c142a1f9e..b64456d83 100644 --- a/phonon/platform_kde/phonon.notifyrc +++ b/phonon/platform_kde/phonon.notifyrc @@ -70,7 +70,6 @@ Comment[zh_TW]=多媒體系統 [Context/Application] Name=Application -Name[ar]=تطبيق Name[bs]=Aplikacija Name[ca]=Aplicació Name[ca@valencia]=Aplicació diff --git a/plasma-windowed/plasma-windowed.desktop b/plasma-windowed/plasma-windowed.desktop index 0decb15a3..959a259ff 100755 --- a/plasma-windowed/plasma-windowed.desktop +++ b/plasma-windowed/plasma-windowed.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Name=Plasma Windowed -Name[ar]=بلازما في نافذة Name[bs]=Plazma uprozorena Name[ca]=Plasma amb finestres Name[ca@valencia]=Plasma amb finestres @@ -44,7 +43,6 @@ Name[x-test]=xxPlasma Windowedxx Name[zh_CN]=窗口化 Plasma Name[zh_TW]=Plasma 視窗 Comment=Run Plasmoids as simple applications -Comment[ar]=شغّل البلازمويدات كتطبيقات بسيطة Comment[bs]=Pokreni plazmoide kao običnu aplikaciju Comment[ca]=Executa els plasmoides com a simples aplicacions Comment[ca@valencia]=Executa els plasmoides com a simples aplicacions diff --git a/runners/appstream/appstreamrunner.desktop b/runners/appstream/appstreamrunner.desktop index 6df83c7b6..92df96451 100644 --- a/runners/appstream/appstreamrunner.desktop +++ b/runners/appstream/appstreamrunner.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Name=Software Center -Name[ar]=مركز البرمجيّات Name[ca]=Centre de programari Name[ca@valencia]=Centre de programari Name[cs]=Centrum softwaru @@ -38,7 +37,6 @@ Name[x-test]=xxSoftware Centerxx Name[zh_CN]=软件中心 Name[zh_TW]=軟體中心 Comment=Lets you find software -Comment[ar]=ابحث عن البرمجيّات Comment[ca]=Permet cercar programari Comment[ca@valencia]=Permet buscar programari Comment[cs]=Umožní vám hledat software diff --git a/runners/baloo/plasma-runner-baloosearch.desktop b/runners/baloo/plasma-runner-baloosearch.desktop index 32cca20af..073d1536a 100644 --- a/runners/baloo/plasma-runner-baloosearch.desktop +++ b/runners/baloo/plasma-runner-baloosearch.desktop @@ -45,7 +45,6 @@ Name[x-test]=xxDesktop Searchxx Name[zh_CN]=桌面搜索 Name[zh_TW]=桌面搜尋 Comment=Searches through files, emails and contacts -Comment[ar]=يبحث في الملفات، والبُرُد الإلكترونية والمتراسلين Comment[ca]=Cerca pels fitxers, correus electrònics i contactes Comment[ca@valencia]=Busca pels fitxers, correus electrònics i contactes Comment[cs]=Prohledává v souborech, emailech a kontaktech diff --git a/runners/powerdevil/plasma-runner-powerdevil.desktop b/runners/powerdevil/plasma-runner-powerdevil.desktop index caaff3752..a15e8e95f 100644 --- a/runners/powerdevil/plasma-runner-powerdevil.desktop +++ b/runners/powerdevil/plasma-runner-powerdevil.desktop @@ -73,7 +73,6 @@ Comment[zh_CN]=基本电源管理操作 Comment[zh_TW]=基本的電源管理操作 Icon=preferences-system-power-management Name=Power -Name[ar]=الطّاقة Name[ca]=Energia Name[ca@valencia]=Energia Name[cs]=Energie diff --git a/shell/packageplugins/qmlWallpaper/plasma-packagestructure-wallpaper.desktop b/shell/packageplugins/qmlWallpaper/plasma-packagestructure-wallpaper.desktop index 3cc9b3201..99becdf80 100644 --- a/shell/packageplugins/qmlWallpaper/plasma-packagestructure-wallpaper.desktop +++ b/shell/packageplugins/qmlWallpaper/plasma-packagestructure-wallpaper.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Name=Wallpaper -Name[ar]=الخلفيّة Name[bs]=Pozadina Name[ca]=Fons d'escriptori Name[ca@valencia]=Fons d'escriptori diff --git a/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop b/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop index 86bc471db..d3ace2465 100644 --- a/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop +++ b/shell/packageplugins/shell/plasma-packagestructure-plasma-shell.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Name=Plasma Shell -Name[ar]=صدفة بلازما Name[bs]=Plazma školjka Name[ca]=Intèrpret d'ordres del Plasma Name[ca@valencia]=Intèrpret d'ordes del Plasma diff --git a/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop b/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop index 603f1ccc2..e0d1c85b0 100644 --- a/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop +++ b/shell/packageplugins/wallpaperimages/plasma-packagestructure-wallpaperimages.desktop @@ -1,6 +1,5 @@ [Desktop Entry] Name=Wallpaper Images -Name[ar]=صور الخلفيّة Name[bs]=Pozadinske slike Name[ca]=Imatges de fons d'escriptori Name[ca@valencia]=Imatges de fons d'escriptori