1
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00

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"
This commit is contained in:
l10n daemon script 2022-09-06 01:45:36 +00:00
parent 1fac29ecea
commit bdfeff5b08
13 changed files with 17 additions and 0 deletions

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=AdBlock Name=AdBlock
Name[ar]=آدبلوك
Name[az]=AdBlock Name[az]=AdBlock
Name[bg]=AdBlock Name[bg]=AdBlock
Name[ca]=AdBlock Name[ca]=AdBlock
@ -38,6 +39,7 @@ Name[x-test]=xxAdBlockxx
Name[zh_CN]=AdBlock Name[zh_CN]=AdBlock
Name[zh_TW]=AdBlock Name[zh_TW]=AdBlock
Comment=Blocks unwanted web content Comment=Blocks unwanted web content
Comment[ar]=تمنع محتوى الويب غير المرغوب به
Comment[az]=Arzuolunmaz veb məzmunu əngəlləyir Comment[az]=Arzuolunmaz veb məzmunu əngəlləyir
Comment[bg]=Блокира нежелано уеб съдържание Comment[bg]=Блокира нежелано уеб съдържание
Comment[ca]=Bloqueja el contingut web no desitjat Comment[ca]=Bloqueja el contingut web no desitjat

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=AutoScroll Name=AutoScroll
Name[ar]=التمرير التلقائيّ
Name[az]=AvtoSürüşmə Name[az]=AvtoSürüşmə
Name[bg]=Автоматично прелистване Name[bg]=Автоматично прелистване
Name[ca]=Desplaçament automàtic Name[ca]=Desplaçament automàtic

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Dictionary Name=Dictionary
Name[ar]=قاموس
Name[az]=Lüğət Name[az]=Lüğət
Name[bg]=Речник Name[bg]=Речник
Name[ca]=Diccionari Name[ca]=Diccionari

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Google Name=Google
Name[ar]=غوغل
Name[az]=Google Name[az]=Google
Name[bg]=Google Name[bg]=Google
Name[ca]=Google Name[ca]=Google
@ -37,6 +38,7 @@ Name[x-test]=xxGooglexx
Name[zh_CN]=Google Name[zh_CN]=Google
Name[zh_TW]=Google Name[zh_TW]=Google
Comment=Search with... Comment=Search with...
Comment[ar]=ابحث باستخدام...
Comment[az]=Bununla axtarmaq... Comment[az]=Bununla axtarmaq...
Comment[bg]=Търсене с... Comment[bg]=Търсене с...
Comment[ca]=Cerca amb... Comment[ca]=Cerca amb...

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=TinEye Name=TinEye
Name[ar]=تن آي
Name[az]=TinEye Name[az]=TinEye
Name[bg]=TinEye Name[bg]=TinEye
Name[ca]=TinEye Name[ca]=TinEye
@ -37,6 +38,7 @@ Name[x-test]=xxTinEyexx
Name[zh_CN]=TinEye Name[zh_CN]=TinEye
Name[zh_TW]=TinEye Name[zh_TW]=TinEye
Comment=Search with... Comment=Search with...
Comment[ar]=ابحث باستخدام...
Comment[az]=Bununla axtarmaq... Comment[az]=Bununla axtarmaq...
Comment[bg]=Търсене с... Comment[bg]=Търсене с...
Comment[ca]=Cerca amb... Comment[ca]=Cerca amb...

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Translate page Name=Translate page
Name[ar]=ترجم الصفة
Name[az]=Səhifənin tərcümə etmək Name[az]=Səhifənin tərcümə etmək
Name[bg]=Превеждане на уеб страница Name[bg]=Превеждане на уеб страница
Name[ca]=Tradueix la pàgina Name[ca]=Tradueix la pàgina

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Validate page Name=Validate page
Name[ar]=تحقق الصفحة
Name[az]=Səhifəni doğrulamaq Name[az]=Səhifəni doğrulamaq
Name[bg]=Валидиране на страницата Name[bg]=Валидиране на страницата
Name[ca]=Valida la pàgina Name[ca]=Valida la pàgina

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Yandex Name=Yandex
Name[ar]=ياندكس
Name[az]=Yandex Name[az]=Yandex
Name[bg]=Yandex Name[bg]=Yandex
Name[ca]=Yandex Name[ca]=Yandex
@ -37,6 +38,7 @@ Name[x-test]=xxYandexxx
Name[zh_CN]=Yandex Name[zh_CN]=Yandex
Name[zh_TW]=Yandex Name[zh_TW]=Yandex
Comment=Search with... Comment=Search with...
Comment[ar]=ابحث باستخدام...
Comment[az]=Bununla axtarmaq... Comment[az]=Bununla axtarmaq...
Comment[bg]=Търсене с... Comment[bg]=Търсене с...
Comment[ca]=Cerca amb... Comment[ca]=Cerca amb...

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Run Action Name=Run Action
Name[ar]=شغّل إجراءً
Name[az]=Əməli Başlatmaq Name[az]=Əməli Başlatmaq
Name[bg]=Изпълнение на действие Name[bg]=Изпълнение на действие
Name[ca]=Executa una acció Name[ca]=Executa una acció

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Chrome Name=Chrome
Name[ar]=كروم
Name[az]=Chrome Name[az]=Chrome
Name[bg]=Chrome Name[bg]=Chrome
Name[ca]=Chrome Name[ca]=Chrome

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Linux Name=Linux
Name[ar]=لينكس
Name[az]=Linux Name[az]=Linux
Name[bg]=Linux Name[bg]=Linux
Name[ca]=Linux Name[ca]=Linux

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Mac Name=Mac
Name[ar]=ماك
Name[az]=Mac Name[az]=Mac
Name[bg]=Mac Name[bg]=Mac
Name[ca]=Mac Name[ca]=Mac

View File

@ -1,5 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Windows Name=Windows
Name[ar]=ويندوز
Name[az]=Windows Name[az]=Windows
Name[bg]=Windows Name[bg]=Windows
Name[ca]=Windows Name[ca]=Windows