From 411bb931197956924876ce6c9636589a4260b661 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 26 Jan 2023 03:07:12 +0000 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" --- src/plugins/AutoScroll/metadata.desktop | 1 + src/scripts/hellopython/metadata.desktop | 2 ++ src/scripts/helloqml/metadata.desktop | 2 ++ src/scripts/middleclickloader/metadata.desktop | 2 ++ src/scripts/runaction/metadata.desktop | 1 + themes/chrome/metadata.desktop | 1 + themes/linux/metadata.desktop | 1 + themes/mac/metadata.desktop | 1 + themes/windows/metadata.desktop | 1 + 9 files changed, 12 insertions(+) diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index 22876d021..977ae74c6 100644 --- a/src/plugins/AutoScroll/metadata.desktop +++ b/src/plugins/AutoScroll/metadata.desktop @@ -38,6 +38,7 @@ Name[x-test]=xxAutoScrollxx Name[zh_CN]=自动滚动 Name[zh_TW]=AutoScroll Comment=Provides support for autoscroll with middle mouse button +Comment[ar]=يوفر الدعم للتمرير آلي بزر الفأرة الأوسط Comment[az]=Siçanın orta düyməsi ilə avtosürüşmə dəstəklənməsini təmin edir Comment[bg]=Автоматично прелистване със средния бутон на мишката Comment[ca]=Proporciona suport per al desplaçament automàtic amb el botó del mig del ratolí diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index 725bd677a..db9deeb37 100644 --- a/src/scripts/hellopython/metadata.desktop +++ b/src/scripts/hellopython/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Hello Python +Name[ar]=أهلا بايثون Name[az]=Salam, Python Name[bg]=Hello Python Name[ca]=Hola Python @@ -37,6 +38,7 @@ Name[x-test]=xxHello Pythonxx Name[zh_CN]=Hello Python Name[zh_TW]=嗨 Python Comment=Example Python extension +Comment[ar]=مثال على امتداد بايثون Comment[az]=Python qoşması nümunəsi Comment[bg]=Примерно разширение на Python Comment[ca]=Exemple d'una extensió en Python diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 19bc2a89a..11b1fdc79 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Hello Qml +Name[ar]=أهلا QML Name[az]=Salam Qml Name[bg]=Hello Qml Name[ca]=Hola Qml @@ -37,6 +38,7 @@ Name[x-test]=xxHello Qmlxx Name[zh_CN]=Hello Qml Name[zh_TW]=嗨 QML Comment=Sample Qml Plugin +Comment[ar]=مثال ملحق QML Comment[az]=Sadə Qml qoşması Comment[bg]=Примерна приставка на Qml Comment[ca]=Connector Qml d'exemple diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 2f5f1f3c4..33a4998d0 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=MiddleClickLoader +Name[ar]=محمل النقر الأوسط Name[az]=Orta Klik Yükləyici Name[bg]=MiddleClickLoader Name[ca]=MiddleClickLoader @@ -37,6 +38,7 @@ Name[x-test]=xxMiddleClickLoaderxx Name[zh_CN]=中键加载器 Name[zh_TW]=MiddleClickLoader Comment=Load text in selection clipboard as URL +Comment[ar]=حمل النص في تحديد الحافظة كرابط Comment[az]=Mətni mübadilə yaddaşına URL kimi yükləmək Comment[bg]=Зарежда текст от селекцията като URL адрес Comment[ca]=Carrega text com a URL en una selecció del porta-retalls diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index fe8d4c003..49ea1ec62 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -38,6 +38,7 @@ Name[x-test]=xxRun Actionxx Name[zh_CN]=执行操作 Name[zh_TW]=執行動作 Comment=Run various actions on sites +Comment[ar]=شغل عدة إجراءات على المواقع Comment[az]=Saytlarda müxtəlif əməliyyatları başlatmaq Comment[bg]=Изпълнение на различни действия върху страницата Comment[ca]=Executa diverses accions als llocs diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index 76be44bc4..0a8b4a55b 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -38,6 +38,7 @@ Name[x-test]=xxChromexx Name[zh_CN]=Chrome Name[zh_TW]=Chrome Comment=Chrome like theme for Falkon based on Firefox Chromifox theme +Comment[ar]=سمة شبيهة بكروم لفالكون بالاعتماد على سمة فيرفوكس Chromifox Comment[az]=Falkon üçün Firefox Chromifox mövzusuna əsaslanan Chrome mövzusu Comment[bg]=Тема подобна на Chrome, базирана на Chromifox за Firefox Comment[ca]=Tema semblant al Chrome pel Falkon, basat en el tema Chromifox del Firefox diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index 00e14d918..1dc8485cc 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -38,6 +38,7 @@ Name[x-test]=xxLinuxxx Name[zh_CN]=Linux Name[zh_TW]=Linux Comment=Default simple theme for Linux using native widget style and some basic icons from desktop icon set +Comment[ar]=السمة الافتراضية البسيطة للينكس باستخدام نمط عنصر واجهة المستخدم الأصلية وبعض الرموز الأساسية من مجموعة أيقونة سطح المكتب Comment[az]=Yerli vidjet üslubu və İş masası simvollarındakı bəzi əsas nişanlardan istifadə edərək Linux üçün standart sadə mövzu Comment[bg]=По подразбиране проста тема за Linux, използвайки нативния стил на уиджетите и някои основни икони на работния плот Comment[ca]=Tema senzill predeterminat per a Linux, usant l'estil natiu dels ginys i diverses icones bàsiques del conjunt d'icones de l'escriptori diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index accb01604..87e9b51f7 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -38,6 +38,7 @@ Name[x-test]=xxMacxx Name[zh_CN]=Mac Name[zh_TW]=Mac Comment=Mac like theme for Falkon based on Firefox Mac OS X theme +Comment[ar]=سمة شبيهة بماك لفالكون بالاعتماد على سمة فيرفوكس ماك اوس اكس Comment[az]=Falkon üçün Firefox Mac OS X mövzusuna əsaslanan Mac mövzusu Comment[bg]=Тема подобна на Mac, базирана на Firefox Mac OS X Comment[ca]=Tema semblant al Mac pel Falkon, basat en el tema Mac OS X del Firefox diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index c6e3b2594..c1432f4f6 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -38,6 +38,7 @@ Name[x-test]=xxWindowsxx Name[zh_CN]=Windows Name[zh_TW]=Windows Comment=Windows like theme based on Material design +Comment[ar]=سمة شبية بويندوز بالاعتماد على ماتيريال ديزاين Comment[az]=Material dizaynında Windows oxşarı mövzu Comment[bg]=Тема подобна на Windows, базирана на Material design Comment[ca]=Tema semblant al Windows, basat en el «Material design»