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"
10 years ago · 0e35c812b0
parent 49194b6229
commit 0e35c812b0
53 changed files with 55 additions and 0 deletions
--- a/applets/devicenotifier/test-predicate-openinwindow.desktop
+++ b/applets/devicenotifier/test-predicate-openinwindow.desktop
@ -6,6 +6,7 @@ Actions=open;
 [Desktop Action open]
 Name=Open with File Manager
 Name[ar]=افتح بمدير الملفات
+Name[ast]=Abrir col xestor de ficheros
 Name[bg]=Отваряне с файлов мениджър
 Name[bs]=Otvori menadžerom datoteka
 Name[ca]=Obre amb el gestor de fitxers
--- a/applets/icon/package/metadata.desktop
+++ b/applets/icon/package/metadata.desktop
@ -3,6 +3,7 @@ Name=Icon
 Name[af]=Ikoon
 Name[ar]=أيقونة
 Name[as]=আইকন
+Name[ast]=Iconu
 Name[be@latin]=Ikona
 Name[bg]=Икона
 Name[bn]=আইকন
--- a/applets/systemmonitor/memory/metadata.desktop
+++ b/applets/systemmonitor/memory/metadata.desktop
@ -2,6 +2,7 @@
 Encoding=UTF-8
 Name=Memory Status
 Name[ar]=حالة الذاكرة
+Name[ast]=Estáu de memoria
 Name[bg]=Състояние на паметта
 Name[bs]=Stanje memorije
 Name[ca]=Estat de la memòria
@ -64,6 +65,7 @@ Name[zh_CN]=内存状态
 Name[zh_TW]=記憶體狀態
 Comment=A RAM usage monitor
 Comment[ar]=مرقاب لاستخدام الذاكرة العشوائية
+Comment[ast]=Monitor d'usu de RAM
 Comment[bg]=Изпозлване на оперативната памет (RAM)
 Comment[bs]=Nadgledanje upotrebe RAM‑a
 Comment[ca]=Un controlador d'ús de la RAM
--- a/applets/systemmonitor/net/metadata.desktop
+++ b/applets/systemmonitor/net/metadata.desktop
@ -2,6 +2,7 @@
 Encoding=UTF-8
 Name=Network Monitor
 Name[ar]=مرقاب الشبكة
+Name[ast]=Monitor de rede
 Name[bg]=Наблюдение на мрежата
 Name[bs]=Nadzor mreže
 Name[ca]=Controlador de la xarxa
@ -65,6 +66,7 @@ Name[zh_CN]=网络监视器
 Name[zh_TW]=網路監控
 Comment=A network usage monitor
 Comment[ar]=مرقاب لاستخدام الشبكة
+Comment[ast]=Monitor d'usu de rede
 Comment[be@latin]=Nazirańnik zaniataści sietki
 Comment[bg]=Наблюдение на изпозлването на мрежата
 Comment[bs]=Nadgledanje upotrebe mreže
--- a/containmentactions/paste/plasma-containmentactions-paste.desktop
+++ b/containmentactions/paste/plasma-containmentactions-paste.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Paste
 Name[ar]=الصق
+Name[ast]=Apegar
 Name[bg]=Поставяне
 Name[bn]=পেস্ট
 Name[bs]=Naljepljivanje
--- a/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop
+++ b/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Switch Desktop
 Name[ar]=بدّل سطح المكتب
+Name[ast]=Camudar d'escritoriu
 Name[bg]=Превключване на работен плот
 Name[bn]=অন্য ডেস্কটপ
 Name[bs]=Prebacivanje površi
--- a/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop
+++ b/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Switch Window
 Name[ar]=بدّل النافذة
+Name[ast]=Camudar de ventana
 Name[bg]=Превключване на прозорци
 Name[bs]=Prebacivanje prozora
 Name[ca]=Canvi de finestra
--- a/dataengines/activities/plasma-dataengine-activities.desktop
+++ b/dataengines/activities/plasma-dataengine-activities.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Activities Engine
 Name[ar]=محرّك الأنشطة
+Name[ast]=Motor d'actividaes
 Name[bg]=Ядро за дейности
 Name[bs]=Motor aktivnosti
 Name[ca]=Motor d'activitats
--- a/dataengines/akonadi/plasma-engine-akonadi.desktop
+++ b/dataengines/akonadi/plasma-engine-akonadi.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Akonadi
 Name[ar]=أكونادي
+Name[ast]=Akonadi
 Name[bg]=Akonadi
 Name[bs]=Akonadi
 Name[ca]=Akonadi
--- a/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop
+++ b/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Application Job Information
 Name[ar]=معلومات مهمّة التطبيق
+Name[ast]=Información de trabayu d'aplicación
 Name[be@latin]=Źviestki pra zadańnie aplikacyi
 Name[bs]=Podaci o poslovima programâ
 Name[ca]=Informació de les tasques de les aplicacions
--- a/dataengines/apps/plasma-dataengine-apps.desktop
+++ b/dataengines/apps/plasma-dataengine-apps.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Application Information
 Name[ar]=معلومات التطبيقات
+Name[ast]=Información d'aplicación
 Name[bn]=অ্যাপলিকেশন তথ্য
 Name[bs]=Podaci o programima
 Name[ca]=Informació de les aplicacions
--- a/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop
+++ b/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Device Notifications
 Name[ar]=إخطارات الأجهزة
+Name[ast]=Avisos de preseos
 Name[bg]=Уведомления от устройства
 Name[bn]=ডিভাইস বিজ্ঞপ্তি
 Name[bs]=Obavještenja o uređajima
--- a/dataengines/dict/plasma-dataengine-dict.desktop
+++ b/dataengines/dict/plasma-dataengine-dict.desktop
@ -2,6 +2,7 @@
 Name=Dictionary
 Name[ar]=قاموس
 Name[as]=অভিধান
+Name[ast]=Diccionariu
 Name[be@latin]=Słoŭnik
 Name[bg]=Речник
 Name[bn]=অভিধান
--- a/dataengines/executable/plasma-dataengine-executable.desktop
+++ b/dataengines/executable/plasma-dataengine-executable.desktop
@ -2,6 +2,7 @@
 Encoding=UTF-8
 Name=Run Commands
 Name[ar]=شغّل أوامر
+Name[ast]=Executar órdenes
 Name[be@latin]=Vykonvaj zahady
 Name[bg]=Изпълнение на команди
 Name[bn]=কমান্ড চালাও
--- a/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop
+++ b/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Files and Directories
 Name[ar]=ملفات وأدلة
+Name[ast]=Ficheros y direutorios
 Name[be@latin]=Fajły j katalohi
 Name[bg]=Файлове и папки
 Name[bn]=ফাইল এবং ডিরেক্টরি
--- a/dataengines/network/plasma-dataengine-network.desktop
+++ b/dataengines/network/plasma-dataengine-network.desktop
@ -2,6 +2,7 @@
 Encoding=UTF-8
 Name=Networking
 Name[ar]=الشبكة
+Name[ast]=Rede
 Name[be@latin]=Sietka
 Name[bg]=Мрежа
 Name[bn]=নেটওয়ার্কিং
--- a/dataengines/notifications/plasma-dataengine-notifications.desktop
+++ b/dataengines/notifications/plasma-dataengine-notifications.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Application Notifications
 Name[ar]=إخطارات التطبيقات
+Name[ast]=Avisos d'aplicaciones
 Name[be@latin]=Infarmavańni aplikacyj
 Name[bg]=Програмни съобщения
 Name[bn]=অ্যাপলিকেশন বিজ্ঞপ্তি
--- a/dataengines/places/plasma-dataengine-places.desktop
+++ b/dataengines/places/plasma-dataengine-places.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Places
 Name[ar]=أماكن
+Name[ast]=Llugares
 Name[be@latin]=Miescy
 Name[bg]=Места
 Name[bn]=স্থান
--- a/dataengines/rss/plasma-dataengine-rss.desktop
+++ b/dataengines/rss/plasma-dataengine-rss.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=RSS
+Name[ast]=RSS
 Name[be@latin]=RSS
 Name[bg]=RSS
 Name[bn]=RSS
--- a/dataengines/share/backends/imgur/metadata.desktop
+++ b/dataengines/share/backends/imgur/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Imgur
+Name[ast]=Imgur
 Name[bg]=Imgur
 Name[bs]=Imgur
 Name[ca]=Imgur
--- a/dataengines/share/backends/kde/metadata.desktop
+++ b/dataengines/share/backends/kde/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=paste.kde.org
+Name[ast]=paste.kde.org
 Name[bs]=paste.kde.org
 Name[ca]=paste.kde.org
 Name[ca@valencia]=paste.kde.org
--- a/dataengines/share/backends/pastebincom/metadata.desktop
+++ b/dataengines/share/backends/pastebincom/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=pastebin.com
+Name[ast]=pastebin.com
 Name[bg]=pastebin.com
 Name[bs]=pastebin.com
 Name[ca]=pastebin.com
--- a/dataengines/share/backends/pasteopensuseorg/metadata.desktop
+++ b/dataengines/share/backends/pasteopensuseorg/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=paste.opensuse.org
+Name[ast]=paste.opensuse.org
 Name[bg]=paste.opensuse.org
 Name[bs]=paste.opensuse.org
 Name[ca]=paste.opensuse.org
--- a/dataengines/share/backends/pasteubuntucom/metadata.desktop
+++ b/dataengines/share/backends/pasteubuntucom/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=paste.ubuntu.com
+Name[ast]=paste.ubuntu.com
 Name[bg]=paste.ubuntu.com
 Name[bs]=paste.ubuntu.com
 Name[ca]=paste.ubuntu.com
--- a/dataengines/share/backends/privatepaste/metadata.desktop
+++ b/dataengines/share/backends/privatepaste/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=privatepaste.com
+Name[ast]=privatepaste.com
 Name[bg]=privatepaste.com
 Name[bs]=privatepaste.com
 Name[ca]=privatepaste.com
--- a/dataengines/share/backends/wklej/metadata.desktop
+++ b/dataengines/share/backends/wklej/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=wklej.org
+Name[ast]=wklej.org
 Name[bg]=wklej.org
 Name[bs]=wklej.org
 Name[ca]=wklej.org
--- a/dataengines/share/backends/wstaw/metadata.desktop
+++ b/dataengines/share/backends/wstaw/metadata.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=wstaw.org
+Name[ast]=wstaw.org
 Name[bg]=wstaw.org
 Name[bs]=wstaw.org
 Name[ca]=wstaw.org
--- a/dataengines/share/packagestructure/plasma-packagestructure-share.desktop
+++ b/dataengines/share/packagestructure/plasma-packagestructure-share.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=ShareProvider
+Name[ast]=ShareProvider
 Name[bg]=Доставчик на услуги за споделяне
 Name[bs]=Dobavljač dijeljenja
 Name[ca]=ShareProvider
--- a/dataengines/share/plasma-dataengine-share.desktop
+++ b/dataengines/share/plasma-dataengine-share.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Share Services
 Name[ar]=خدمات المشاركة
+Name[ast]=Compartir Servicios
 Name[bg]=Услуги за споделяне
 Name[bs]=Servisi dijeljenja
 Name[ca]=Serveis de compartició
--- a/dataengines/statusnotifieritem/plasma-dataengine-statusnotifieritem.desktop
+++ b/dataengines/statusnotifieritem/plasma-dataengine-statusnotifieritem.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Status Notifier Information
 Name[ar]=معلومات مُخطِر الحالة
+Name[ast]=Información d'avisador d'estaos
 Name[bs]=Podaci izveštavača o stanju
 Name[ca]=Informació del notificador d'estats
 Name[ca@valencia]=Informació del notificador d'estats
--- a/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop
+++ b/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop
@ -3,6 +3,7 @@ Encoding=UTF-8
 Name=System Monitor
 Name[af]=Stelsel Monitor
 Name[ar]=مرقاب النظام
+Name[ast]=Monitor del sistema
 Name[be]=Сістэмны назіральнік
 Name[be@latin]=Systemny nazirańnik
 Name[bg]=Наблюдение на системата
--- a/dataengines/time/plasma-dataengine-time.desktop
+++ b/dataengines/time/plasma-dataengine-time.desktop
@ -2,6 +2,7 @@
 Name=Date and Time
 Name[ar]=التاريخ والوقت
 Name[as]=তাৰিখ আৰু সময়
+Name[ast]=Data y hora
 Name[be@latin]=Data j čas
 Name[bg]=Дата и час
 Name[bn]=তারিখ এবং সময়
--- a/dataengines/weather/ions/wetter.com/ion-wettercom.desktop
+++ b/dataengines/weather/ions/wetter.com/ion-wettercom.desktop
@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=wetter.com
+Name[ast]=wetter.com
 Name[bg]=wetter.com
 Name[bn]=wetter.com
 Name[bs]=wetter.com
--- a/drkonqi/data/debuggers/external/gdbrc
+++ b/drkonqi/data/debuggers/external/gdbrc
@ -1,5 +1,6 @@
 [General]
 Name=gdb
+Name[ast]=gdb
 Name[bg]=gdb
 Name[bn]=gdb
 Name[bs]=gDB
--- a/drkonqi/data/debuggers/external/kdbgrc
+++ b/drkonqi/data/debuggers/external/kdbgrc
@ -1,5 +1,6 @@
 [General]
 Name=kdbg
+Name[ast]=kdbg
 Name[bg]=kdbg
 Name[bn]=kdbg
 Name[bs]=kdbg
--- a/drkonqi/data/debuggers/internal/dbxrc
+++ b/drkonqi/data/debuggers/internal/dbxrc
@ -1,5 +1,6 @@
 [General]
 Name=dbx
+Name[ast]=dbx
 Name[bg]=dbx
 Name[bn]=dbx
 Name[bs]=dBX
--- a/drkonqi/data/debuggers/internal/gdbrc
+++ b/drkonqi/data/debuggers/internal/gdbrc
@ -1,5 +1,6 @@
 [General]
 Name=gdb
+Name[ast]=gdb
 Name[bg]=gdb
 Name[bn]=gdb
 Name[bs]=gDB
--- a/drkonqi/data/debuggers/internal/kdbgwinrc
+++ b/drkonqi/data/debuggers/internal/kdbgwinrc
@ -1,5 +1,6 @@
 [General]
 Name=kdbgwin
+Name[ast]=kdbgwin
 Name[bg]=kdbgwin
 Name[bn]=kdbgwin
 Name[bs]=kdbgwin
--- a/freespacenotifier/freespacenotifier.desktop
+++ b/freespacenotifier/freespacenotifier.desktop
@ -7,6 +7,7 @@ X-KDE-Kded-autoload=true

 Name=Free Space Notifier
 Name[ar]=مُخطِر المساحة الحرّة
+Name[ast]=Avisador d'espaciu llibre
 Name[bg]=Уведомяване за свободно пространство
 Name[bs]=Izvještač o slobodnom prostoru
 Name[ca]=Notificador d'espai lliure
--- a/freespacenotifier/freespacenotifier.notifyrc
+++ b/freespacenotifier/freespacenotifier.notifyrc
@ -133,6 +133,7 @@ Name=Warning
 Name[af]=Waarskuwing
 Name[ar]=تحذير
 Name[as]=সতৰ্কবাণী
+Name[ast]=Alvertencia
 Name[be]=Папярэджанне
 Name[be@latin]=Uvaha
 Name[bg]=Предупреждение
--- a/kioslave/desktop/desktopnotifier.desktop
+++ b/kioslave/desktop/desktopnotifier.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Type=Service
 Name=Directory Watcher
+Name[ast]=Visor de direutorios
 Name[ca]=Vigilant de directori
 Name[ca@valencia]=Vigilant de directori
 Name[da]=Mappeovervåger
--- a/menu/desktop/kf5-utilities-accessibility.directory
+++ b/menu/desktop/kf5-utilities-accessibility.directory
@ -99,6 +99,7 @@ Comment=Accessibility
 Comment[af]=Toeganklikheid
 Comment[ar]=الإتاحة
 Comment[as]=অভিগম্যতা
+Comment[ast]=Accesibilidá
 Comment[be]=Даступнасць
 Comment[be@latin]=Dastupnaść
 Comment[bg]=Равностоен достъп
--- a/menu/desktop/kf5-utilities-desktop.directory
+++ b/menu/desktop/kf5-utilities-desktop.directory
@ -49,6 +49,7 @@ Name[zh_TW]=桌面
 Icon=user-desktop
 Comment=Desktop
 Comment[ar]=سطح المكتب
+Comment[ast]=Escritoriu
 Comment[bs]=Radna površina
 Comment[ca]=Escriptori
 Comment[ca@valencia]=Escriptori
--- a/menu/desktop/kf5-utilities-file.directory
+++ b/menu/desktop/kf5-utilities-file.directory
@ -51,6 +51,7 @@ Icon=system-file-manager
 Comment=File
 Comment[ar]=ملف
 Comment[as]=নথিপত্ৰ
+Comment[ast]=Ficheru
 Comment[bs]=Datoteka
 Comment[ca]=Fitxer
 Comment[ca@valencia]=Fitxer
--- a/menu/desktop/kf5-utilities-peripherals.directory
+++ b/menu/desktop/kf5-utilities-peripherals.directory
@ -96,6 +96,7 @@ Comment=Peripherals
 Comment[af]=Randapparatuur 
 Comment[ar]=الوحدات الملحقة
 Comment[as]=যন্ত্ৰ
+Comment[ast]=Periféricos
 Comment[be]=Перыферыя
 Comment[be@latin]=Vonkavaja aparatura
 Comment[bg]=Периферия
--- a/menu/desktop/kf5-utilities.directory
+++ b/menu/desktop/kf5-utilities.directory
@ -49,6 +49,7 @@ Name[zh_TW]=實用工具
 Icon=applications-utilities
 Comment=Utilities
 Comment[ar]=الأدوات
+Comment[ast]=Utilidaes
 Comment[bs]=Usluge
 Comment[ca]=Utilitats
 Comment[ca@valencia]=Utilitats
--- a/runners/locations/plasma-runner-locations.desktop
+++ b/runners/locations/plasma-runner-locations.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Locations
 Name[ar]=المواقع
+Name[ast]=Allugamientos
 Name[be@latin]=Miescy
 Name[bg]=Местоположения
 Name[bn]=অবস্থান
--- a/runners/places/plasma-runner-places.desktop
+++ b/runners/places/plasma-runner-places.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Places
 Name[ar]=أماكن
+Name[ast]=Llugares
 Name[be@latin]=Miescy
 Name[bg]=Места
 Name[bn]=স্থান
--- a/runners/recentdocuments/recentdocuments.desktop
+++ b/runners/recentdocuments/recentdocuments.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Recent Documents
 Name[ar]=المستندات الأخيرة
+Name[ast]=Documentos recientes
 Name[be]=Нядаўнія дакументы
 Name[be@latin]=Niadaŭnyja dakumenty
 Name[bg]=Последно използвани
--- a/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop
+++ b/shell/packageplugins/lookandfeel/plasma-packagestructure-lookandfeel.desktop
@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=Look and Feel
 Name[ar]=المظهر و الأحساس
+Name[ast]=Aspeutu y sentir
 Name[bs]=Izgled i osjećaj
 Name[ca]=Aspecte i comportament
 Name[ca@valencia]=Aspecte i comportament
--- a/soliduiserver/soliduiserver.desktop
+++ b/soliduiserver/soliduiserver.desktop
@ -7,6 +7,7 @@ X-KDE-Kded-autoload=false
 X-KDE-Kded-load-on-demand=true
 Name=Hardware Detection
 Name[ar]=اكتشاف العتاد
+Name[ast]=Deteición de hardware
 Name[bs]=Detekcija hardvera
 Name[ca]=Detecció de maquinari
 Name[ca@valencia]=Detecció de maquinari
--- a/statusnotifierwatcher/statusnotifierwatcher.desktop
+++ b/statusnotifierwatcher/statusnotifierwatcher.desktop
@ -2,6 +2,7 @@
 Type=Service
 Name=Status Notifier Manager
 Name[ar]=مدير مُخطِر الحالة
+Name[ast]=Xestor d'avisador d'estaos
 Name[bn]=স্ট্যাটাস বিজ্ঞপ্তি ম্যানেজার
 Name[bs]=Menadžer izveštavača o stanju
 Name[ca]=Gestor del notificador d'estat
--- a/themes/keramik.themerc
+++ b/themes/keramik.themerc
@ -2,6 +2,7 @@
 Name=Keramik
 Name[af]=Keramik
 Name[ar]=خزف
+Name[ast]=Keramik
 Name[be]=Keramik
 Name[be@latin]=Keramik
 Name[bg]=Keramik