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"
8 years ago · d389cde75f
parent 97db601d24
commit d389cde75f
29 changed files with 7 additions and 41 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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(ů)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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]=Системен буфер
--- 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
--- 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]=Системен буфер
--- 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.
--- 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
--- 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
--- 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
--- 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
--- 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ó
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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