From 7510fb8918893a27a48be93a5827c20ccabe9e9c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 6 Sep 2022 02:48:22 +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/lib/adblock/metadata.desktop | 2 ++ src/plugins/AutoScroll/metadata.desktop | 1 + src/scripts/runaction/actions/dictionary.desktop | 1 + src/scripts/runaction/actions/googleimagesearch.desktop | 2 ++ src/scripts/runaction/actions/tineyeimagesearch.desktop | 2 ++ src/scripts/runaction/actions/translate.desktop | 1 + src/scripts/runaction/actions/w3.desktop | 1 + src/scripts/runaction/actions/yandeximagesearch.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 + 13 files changed, 17 insertions(+) diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index 7974e2f58..048f03193 100644 --- a/src/lib/adblock/metadata.desktop +++ b/src/lib/adblock/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=AdBlock +Name[ar]=آدبلوك Name[az]=AdBlock Name[bg]=AdBlock Name[ca]=AdBlock @@ -38,6 +39,7 @@ Name[x-test]=xxAdBlockxx Name[zh_CN]=AdBlock Name[zh_TW]=AdBlock Comment=Blocks unwanted web content +Comment[ar]=تمنع محتوى الويب غير المرغوب به Comment[az]=Arzuolunmaz veb məzmunu əngəlləyir Comment[bg]=Блокира нежелано уеб съдържание Comment[ca]=Bloqueja el contingut web no desitjat diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index 1c088af71..47609b53d 100644 --- a/src/plugins/AutoScroll/metadata.desktop +++ b/src/plugins/AutoScroll/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=AutoScroll +Name[ar]=التمرير التلقائيّ Name[az]=AvtoSürüşmə Name[bg]=Автоматично прелистване Name[ca]=Desplaçament automàtic diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index d621cb819..141939b6e 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Dictionary +Name[ar]=قاموس Name[az]=Lüğət Name[bg]=Речник Name[ca]=Diccionari diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 28b3f68de..270802a29 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Google +Name[ar]=غوغل Name[az]=Google Name[bg]=Google Name[ca]=Google @@ -37,6 +38,7 @@ Name[x-test]=xxGooglexx Name[zh_CN]=Google Name[zh_TW]=Google Comment=Search with... +Comment[ar]=ابحث باستخدام... Comment[az]=Bununla axtarmaq... Comment[bg]=Търсене с... Comment[ca]=Cerca amb... diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index bccc181b6..7d0dac3d2 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=TinEye +Name[ar]=تن آي Name[az]=TinEye Name[bg]=TinEye Name[ca]=TinEye @@ -37,6 +38,7 @@ Name[x-test]=xxTinEyexx Name[zh_CN]=TinEye Name[zh_TW]=TinEye Comment=Search with... +Comment[ar]=ابحث باستخدام... Comment[az]=Bununla axtarmaq... Comment[bg]=Търсене с... Comment[ca]=Cerca amb... diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 1c557d5a5..025475af0 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Translate page +Name[ar]=ترجم الصفة Name[az]=Səhifənin tərcümə etmək Name[bg]=Превеждане на уеб страница Name[ca]=Tradueix la pàgina diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index 9027c226e..2d907d982 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Validate page +Name[ar]=تحقق الصفحة Name[az]=Səhifəni doğrulamaq Name[bg]=Валидиране на страницата Name[ca]=Valida la pàgina diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 1d9231bca..89d360671 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Yandex +Name[ar]=ياندكس Name[az]=Yandex Name[bg]=Yandex Name[ca]=Yandex @@ -37,6 +38,7 @@ Name[x-test]=xxYandexxx Name[zh_CN]=Yandex Name[zh_TW]=Yandex Comment=Search with... +Comment[ar]=ابحث باستخدام... Comment[az]=Bununla axtarmaq... Comment[bg]=Търсене с... Comment[ca]=Cerca amb... diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index d09be1267..fe8d4c003 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Run Action +Name[ar]=شغّل إجراءً Name[az]=Əməli Başlatmaq Name[bg]=Изпълнение на действие Name[ca]=Executa una acció diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index 0f87aff6a..c2444c472 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Chrome +Name[ar]=كروم Name[az]=Chrome Name[bg]=Chrome Name[ca]=Chrome diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index b9f6adac0..00e14d918 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Linux +Name[ar]=لينكس Name[az]=Linux Name[bg]=Linux Name[ca]=Linux diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index 0eb1113a8..accb01604 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Mac +Name[ar]=ماك Name[az]=Mac Name[bg]=Mac Name[ca]=Mac diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index 281c27b44..99bb9b57c 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Windows +Name[ar]=ويندوز Name[az]=Windows Name[bg]=Windows Name[ca]=Windows