From a661ac27d46b2653b22c4dab26585d759d49829d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 1 Nov 2020 06:34:37 +0100 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" --- linux/applications/org.kde.falkon.desktop | 6 ++++++ src/lib/adblock/metadata.desktop | 2 ++ src/lib/data/breeze-fallback/index.theme | 2 ++ src/plugins/AutoScroll/metadata.desktop | 2 ++ src/scripts/hellopython/metadata.desktop | 2 ++ src/scripts/helloqml/metadata.desktop | 2 ++ src/scripts/middleclickloader/metadata.desktop | 2 ++ src/scripts/runaction/actions/dictionary.desktop | 1 + src/scripts/runaction/actions/googleimagesearch.desktop | 2 ++ src/scripts/runaction/actions/mpv.desktop | 1 + 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 | 2 ++ themes/chrome/metadata.desktop | 2 ++ themes/linux/metadata.desktop | 2 ++ themes/mac/metadata.desktop | 2 ++ themes/windows/metadata.desktop | 2 ++ 19 files changed, 38 insertions(+) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index 2963ff51d..778308e5c 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=Falkon Name[ar]=فالكون +Name[az]=Falkon Name[ca]=Falkon Name[ca@valencia]=Falkon Name[cs]=Falkon @@ -38,6 +39,7 @@ Icon=falkon Categories=Network;WebBrowser; Comment=A fast and secure web browser Comment[ar]=متصفّح وبّ سريع وآمن +Comment[az]=Sürətli və təhlükəsiz veb bələdçi Comment[ca]=Un navegador web ràpid i segur Comment[ca@valencia]=Un navegador web ràpid i segur Comment[cs]=Rychlý a bezpečný webový prohlížeč @@ -72,6 +74,7 @@ Comment[zh_CN]=快速、安全的网页浏览器 Comment[zh_TW]=快速且安全的網路瀏覽器 GenericName=Web Browser GenericName[ar]=متصفّح وبّ +GenericName[az]=Veb Bələdçi GenericName[ca]=Navegador web GenericName[ca@valencia]=Navegador web GenericName[cs]=Webový prohlížeč @@ -113,6 +116,7 @@ Actions=NewTab;NewWindow;PrivateBrowsing; [Desktop Action NewTab] Name=Open new tab Name[ar]=افتح لسانًا جديدًا +Name[az]=Yeni vərəq açmaq Name[ca]=Obre una pestanya nova Name[ca@valencia]=Obri una pestanya nova Name[cs]=Otevřít novou kartu @@ -151,6 +155,7 @@ Exec=falkon --new-tab [Desktop Action NewWindow] Name=Open new window Name[ar]=افتح نافذة جديدة +Name[az]=Yeni pəncərə açmaq Name[ca]=Obre una finestra nova Name[ca@valencia]=Obri una finestra nova Name[cs]=Otevřít nové okno @@ -189,6 +194,7 @@ Exec=falkon --new-window [Desktop Action PrivateBrowsing] Name=Start private browsing Name[ar]=ابدأ التّصفّح الخاصّ +Name[az]=Məxfi səyahətə başlamaq Name[ca]=Inicia la navegació privada Name[ca@valencia]=Inicia la navegació privada Name[cs]=Začít soukromé prohlížení diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index 54f83b1ce..a6d3adc5a 100644 --- a/src/lib/adblock/metadata.desktop +++ b/src/lib/adblock/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=AdBlock +Name[az]=AdBlock Name[ca]=AdBlock Name[ca@valencia]=AdBlock Name[cs]=AdBlock @@ -33,6 +34,7 @@ Name[x-test]=xxAdBlockxx Name[zh_CN]=AdBlock Name[zh_TW]=AdBlock Comment=Blocks unwanted web content +Comment[az]=Arzuolunmaz veb məzmunu əngəlləyir Comment[ca]=Bloqueja el contingut web no desitjat Comment[ca@valencia]=Bloqueja el contingut web no desitjat Comment[cs]=Blokovat nevyžádaný obsah diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme index 2e2042e73..31bc2aa26 100644 --- a/src/lib/data/breeze-fallback/index.theme +++ b/src/lib/data/breeze-fallback/index.theme @@ -1,6 +1,7 @@ [Icon Theme] Name=Breeze Name[ar]=نسيم +Name[az]=Breeze Name[ca]=Brisa Name[ca@valencia]=Brisa Name[cs]=Breeze @@ -35,6 +36,7 @@ Name[zh_CN]=微风 Name[zh_TW]=Breeze Comment=Breeze Team Comment[ar]=فريق نسيم +Comment[az]=Breeze Komandası Comment[ca]=L'equip del «Breeze» Comment[ca@valencia]=L'equip del «Breeze» Comment[cs]=Team Breeze diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index 782f0dee3..40a55f002 100644 --- a/src/plugins/AutoScroll/metadata.desktop +++ b/src/plugins/AutoScroll/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=AutoScroll +Name[az]=AvtoSürüşmə Name[ca]=Desplaçament automàtic Name[ca@valencia]=Desplaçament automàtic Name[cs]=Automatické posouvání @@ -32,6 +33,7 @@ Name[x-test]=xxAutoScrollxx Name[zh_CN]=自动滚动 Name[zh_TW]=AutoScroll Comment=Provides support for autoscroll with middle mouse button +Comment[az]=Siçanın orta düyməsi ilə avtosürüşmə dəstəklənməsini təmin edir Comment[ca]=Proporciona suport per al desplaçament automàtic amb el botó del mig del ratolí Comment[ca@valencia]=Proporciona suport per al desplaçament automàtic amb el botó del mig del ratolí Comment[cs]=Poskytuje podporu pro automatický posun pomocí prostředního tlačítka diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index 61b56f88d..131f2d3d3 100644 --- a/src/scripts/hellopython/metadata.desktop +++ b/src/scripts/hellopython/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Hello Python +Name[az]=Salam, Python Name[ca]=Hola Python Name[ca@valencia]=Hola Python Name[cs]=Hello Python @@ -32,6 +33,7 @@ Name[x-test]=xxHello Pythonxx Name[zh_CN]=Hello Python Name[zh_TW]=嗨 Python Comment=Example Python extension +Comment[az]=Python qoşması nümunəsi Comment[ca]=Exemple d'una extensió en Python Comment[ca@valencia]=Exemple d'una extensió en Python Comment[cs]=Ukázkové rozšíření v Pythonu diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 5cde9ad82..c7f8c100b 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Hello Qml +Name[az]=Salam Qml Name[ca]=Hola Qml Name[ca@valencia]=Hola Qml Name[cs]=Ahoj QML @@ -32,6 +33,7 @@ Name[x-test]=xxHello Qmlxx Name[zh_CN]=Hello Qml Name[zh_TW]=嗨 QML Comment=Sample Qml Plugin +Comment[az]=Sadə Qml qoşması Comment[ca]=Connector Qml d'exemple Comment[ca@valencia]=Connector Qml d'exemple Comment[cs]=Ukázkový modul QML diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 993e66416..1bb7d1a71 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=MiddleClickLoader +Name[az]=Orta Klik Yükləyici Name[ca]=MiddleClickLoader Name[ca@valencia]=MiddleClickLoader Name[cs]=Načtení prostředním tlačítkem myši @@ -31,6 +32,7 @@ Name[x-test]=xxMiddleClickLoaderxx Name[zh_CN]=中键加载器 Name[zh_TW]=MiddleClickLoader Comment=Load text in selection clipboard as URL +Comment[az]=Mətni mübadilə yaddaşına URL kimi yükləmək Comment[ca]=Carrega text com a URL en una selecció del porta-retalls Comment[ca@valencia]=Carrega text com a URL en una selecció del porta-retalls Comment[cs]=Načíst text ve schránce výběru jako URL diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index 79de362e2..eeb2f9a3c 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Dictionary +Name[az]=Lüğət Name[ca]=Diccionari Name[ca@valencia]=Diccionari Name[cs]=Slovník diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index fb0160dda..102e94219 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Google +Name[az]=Google Name[ca]=Google Name[ca@valencia]=Google Name[cs]=Google @@ -32,6 +33,7 @@ Name[x-test]=xxGooglexx Name[zh_CN]=Google Name[zh_TW]=Google Comment=Search with... +Comment[az]=Bununla axtarmaq... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... Comment[cs]=Hledat pomocí... diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index 5057c4f2c..c308caeda 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Open with mpv +Name[az]=mpv ilə açmaq Name[ca]=Obre amb el «mpv» Name[ca@valencia]=Obri amb el «mpv» Name[cs]=Otevřít pomocí mpv diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 545a63bd3..38ffd5979 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=TinEye +Name[az]=TinEye Name[ca]=TinEye Name[ca@valencia]=TinEye Name[cs]=TinEye @@ -32,6 +33,7 @@ Name[x-test]=xxTinEyexx Name[zh_CN]=TinEye Name[zh_TW]=TinEye Comment=Search with... +Comment[az]=Bununla axtarmaq... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... Comment[cs]=Hledat pomocí... diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 64be9cc2a..fed79b75f 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[az]=Səhifənin tərcümə etmək Name[ca]=Tradueix la pàgina Name[ca@valencia]=Tradueix la pàgina Name[cs]=Přeložit stránku diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index 0a19b368e..259c64fb7 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[az]=Səhifəni doğrulamaq Name[ca]=Valida la pàgina Name[ca@valencia]=Valida la pàgina Name[cs]=Ověřit stránku diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index d0e87b145..7d33eef20 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Yandex +Name[az]=Yandex Name[ca]=Yandex Name[ca@valencia]=Yandex Name[cs]=Yandex @@ -32,6 +33,7 @@ Name[x-test]=xxYandexxx Name[zh_CN]=Yandex Name[zh_TW]=Yandex Comment=Search with... +Comment[az]=Bununla axtarmaq... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... Comment[cs]=Hledat pomocí... diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index d497eaf33..1fe4792ad 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Run Action +Name[az]=Əməli Başlatmaq Name[ca]=Executa una acció Name[ca@valencia]=Executa una acció Name[cs]=Spustit činnost @@ -32,6 +33,7 @@ Name[x-test]=xxRun Actionxx Name[zh_CN]=执行动作 Name[zh_TW]=執行動作 Comment=Run various actions on sites +Comment[az]=Saytlarda müxtəlif əməliyyatları başlatmaq Comment[ca]=Executa diverses accions als llocs Comment[ca@valencia]=Executa diverses accions als llocs Comment[cs]=Spouštět různé činnosti na stránkách diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index 18d201a1b..0ae57b235 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Chrome +Name[az]=Chrome Name[ca]=Chrome Name[ca@valencia]=Chrome Name[cs]=Chrome @@ -32,6 +33,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[az]=Falkon üçün Firefox Chromifox mövzusuna əsaslanan Chrome mövzusu Comment[ca]=Tema semblant al Chrome pel Falkon, basat en el tema Chromifox del Firefox Comment[ca@valencia]=Tema semblant al Chrome pel Falkon, basat en el tema Chromifox del Firefox Comment[cs]=Motiv pro Falkon podobný Chrome založený na motivu Firefox Chromifox diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index c271d3157..4376aa953 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Linux +Name[az]=Linux Name[ca]=Linux Name[ca@valencia]=Linux Name[cs]=Linux @@ -32,6 +33,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[az]=Yerli vidjet üslubu və İş Masası simvollarındakı bəzi əsas nişanlardan istifadə edərək Linux üçün standart sadə mövzu Comment[ca]=Tema senzill predeterminat per a Linux, usant l'estil natiu dels estris i diverses icones bàsiques del conjunt d'icones de l'escriptori Comment[ca@valencia]=Tema senzill predeterminat per a Linux, usant l'estil natiu dels estris i diverses icones bàsiques del conjunt d'icones de l'escriptori Comment[cs]=Výchozí jednoduchý motiv pro Linux používající nativní styl widgetu style a nějaké základní ikony ze sady ikon pracovní plochy diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index 084380362..22e904684 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Mac +Name[az]=Mac Name[ca]=Mac Name[ca@valencia]=Mac Name[cs]=Mac @@ -32,6 +33,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[az]=Falkon üçün Firefox Mac OS X mövzusuna əsaslanan Mac mövzusu Comment[ca]=Tema semblant al Mac pel Falkon, basat en el tema Mac OS X del Firefox Comment[ca@valencia]=Tema semblant al Mac pel Falkon, basat en el tema Mac OS X del Firefox Comment[cs]=Motiv pro Falkon podobný Macu založený na motivu Firefox Mac OS X diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index c0b3d8d2e..954ce1296 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Windows +Name[az]=Windows Name[ca]=Windows Name[ca@valencia]=Windows Name[cs]=Windows @@ -32,6 +33,7 @@ Name[x-test]=xxWindowsxx Name[zh_CN]=Windows Name[zh_TW]=Windows Comment=Windows like theme based on Material design +Comment[az]=Material dizaynında Windows oxşarı mövzu Comment[ca]=Tema semblant al Windows, basat en el «Material design» Comment[ca@valencia]=Tema semblant al Windows, basat en el «Material design» Comment[cs]=Motiv podobný Windows založený na designu Material