From bde26dc8612dfcd0dffa94c856dc43a069d7a0cd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 6 Apr 2019 05:57:30 +0200 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 | 8 +------- src/lib/adblock/metadata.desktop | 4 ++-- src/lib/data/breeze-fallback/index.theme | 4 +--- src/plugins/FlashCookieManager/metadata.desktop | 2 +- src/plugins/StatusBarIcons/metadata.desktop | 2 +- src/plugins/TestPlugin/metadata.desktop | 2 +- src/scripts/runaction/actions/dictionary.desktop | 7 +++++++ .../runaction/actions/googleimagesearch.desktop | 14 ++++++++++++++ src/scripts/runaction/actions/mpv.desktop | 8 ++++++++ .../runaction/actions/tineyeimagesearch.desktop | 14 ++++++++++++++ src/scripts/runaction/actions/translate.desktop | 7 +++++++ src/scripts/runaction/actions/w3.desktop | 9 ++++++++- .../runaction/actions/yandeximagesearch.desktop | 14 ++++++++++++++ src/scripts/runaction/metadata.desktop | 14 ++++++++++++++ 14 files changed, 93 insertions(+), 16 deletions(-) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index 2ba4594e3..5a3247bc3 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -1,7 +1,6 @@ [Desktop Entry] Name=Falkon Name[ar]=فالكون -Name[ast]=Falkon Name[ca]=Falkon Name[ca@valencia]=Falkon Name[cs]=Falkon @@ -31,7 +30,6 @@ Icon=falkon Categories=Network;WebBrowser; Comment=A fast and secure web browser Comment[ar]=متصفّح وبّ سريع وآمن -Comment[ast]=Un restolador web seguru y rápidu 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č @@ -49,7 +47,7 @@ Comment[nn]=Ein kjapp og sikker nettlesar Comment[pl]=Szybka i bezpieczna przeglądarka sieciowa Comment[pt]=Um navegador Web rápido e seguro Comment[pt_BR]=Um navegar Web rápido e seguro -Comment[sk]=Rýchly a bezpečný internetový prehliadač +Comment[sk]=Rýchly a bezpečný prehliadač internetu Comment[sv]=En snabb och säker webbläsare Comment[uk]=Проста і безпечна програма для перегляду інтернету Comment[x-test]=xxA fast and secure web browserxx @@ -57,7 +55,6 @@ Comment[zh_CN]=快速、安全的网页浏览器 Comment[zh_TW]=快速且安全的網路瀏覽器 GenericName=Web Browser GenericName[ar]=متصفّح وبّ -GenericName[ast]=Restolador web GenericName[ca]=Navegador web GenericName[ca@valencia]=Navegador web GenericName[cs]=Webový prohlížeč @@ -90,7 +87,6 @@ Actions=NewTab;NewWindow;PrivateBrowsing; [Desktop Action NewTab] Name=Open new tab Name[ar]=افتح لسانًا جديدًا -Name[ast]=Abrir llingüeta nueva Name[ca]=Obre una pestanya nova Name[ca@valencia]=Obri una pestanya nova Name[cs]=Otevřít novou kartu @@ -119,7 +115,6 @@ Exec=falkon --new-tab [Desktop Action NewWindow] Name=Open new window Name[ar]=افتح نافذة جديدة -Name[ast]=Abrir ventana nueva Name[ca]=Obre una finestra nova Name[ca@valencia]=Obri una finestra nova Name[cs]=Otevřít nové okno @@ -148,7 +143,6 @@ Exec=falkon --new-window [Desktop Action PrivateBrowsing] Name=Start private browsing Name[ar]=ابدأ التّصفّح الخاصّ -Name[ast]=Aniciar restolar en privao 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 9f378d4aa..f40247487 100644 --- a/src/lib/adblock/metadata.desktop +++ b/src/lib/adblock/metadata.desktop @@ -17,7 +17,7 @@ Name[nn]=Reklamefilter Name[pl]=AdBlock Name[pt]=AdBlock Name[pt_BR]=AdBlock -Name[sk]=Adblock +Name[sk]=AdBlock Name[sv]=Reklamblockering Name[uk]=Блокування реклами Name[x-test]=xxAdBlockxx @@ -41,7 +41,7 @@ Comment[nn]=Blokkerer uønskt vevinnhald Comment[pl]=Blokuje niechciane treści z sieci Comment[pt]=Bloqueia o conteúdo Web indesejado Comment[pt_BR]=Bloqueie conteúdos web indesejados -Comment[sk]=Blokuje neželaný internetový obsah +Comment[sk]=Blokuje nechcený obsah Comment[sv]=Blockerar oönskat webbinnehåll Comment[uk]=Блокує небажані інтернет-дані Comment[x-test]=xxBlocks unwanted web contentxx diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme index b1bff3e7b..bf25931e2 100644 --- a/src/lib/data/breeze-fallback/index.theme +++ b/src/lib/data/breeze-fallback/index.theme @@ -1,7 +1,6 @@ [Icon Theme] Name=Breeze Name[ar]=نسيم -Name[ast]=Breeze Name[ca]=Brisa Name[ca@valencia]=Brisa Name[cs]=Breeze @@ -27,7 +26,6 @@ Name[zh_CN]=微风 Name[zh_TW]=Breeze Comment=Breeze Team Comment[ar]=فريق نسيم -Comment[ast]=L'equipu de Breeze Comment[ca]=L'equip «Breeze» Comment[ca@valencia]=L'equip «Breeze» Comment[cs]=Team Breeze @@ -45,7 +43,7 @@ Comment[nn]=Breeze-laget Comment[pl]=Zespół Bryzy Comment[pt]=Equipa do Brisa Comment[pt_BR]=Equipe Breeze -Comment[sk]=Tým Vánok +Comment[sk]=Breeze Team Comment[sv]=Breeze-gruppen Comment[uk]=Команда Breeze Comment[x-test]=xxBreeze Teamxx diff --git a/src/plugins/FlashCookieManager/metadata.desktop b/src/plugins/FlashCookieManager/metadata.desktop index 48be6e069..f8a6b1af6 100644 --- a/src/plugins/FlashCookieManager/metadata.desktop +++ b/src/plugins/FlashCookieManager/metadata.desktop @@ -17,7 +17,7 @@ Name[nn]=Handsamar for Flash-infokapslar Name[pl]=Zarządzanie ciasteczkami Flash Name[pt]=Gestor de 'Cookies' do Flash Name[pt_BR]=Gerenciador de cookies Flash -Name[sk]=Správca Flash Cookie +Name[sk]=Správca pre Flash Cookie Name[sv]=Flash kakhanterare Name[uk]=Керування куками Flash Name[x-test]=xxFlash Cookie Managerxx diff --git a/src/plugins/StatusBarIcons/metadata.desktop b/src/plugins/StatusBarIcons/metadata.desktop index 5b5843f50..bb4e5c710 100644 --- a/src/plugins/StatusBarIcons/metadata.desktop +++ b/src/plugins/StatusBarIcons/metadata.desktop @@ -17,7 +17,7 @@ Name[nn]=Statuslinje-ikon Name[pl]=Ikony paska stanu Name[pt]=Ícones da Barra de Estado Name[pt_BR]=Ícones da barra de status -Name[sk]=Ikony stavovej lišty +Name[sk]=StatusBar Ikony Name[sv]=Ikoner i statusraden Name[uk]=Піктограми смужки стану Name[x-test]=xxStatusBar Iconsxx diff --git a/src/plugins/TestPlugin/metadata.desktop b/src/plugins/TestPlugin/metadata.desktop index b6a66c4e2..4731f28aa 100644 --- a/src/plugins/TestPlugin/metadata.desktop +++ b/src/plugins/TestPlugin/metadata.desktop @@ -17,7 +17,7 @@ Name[nn]=Eksempel-tillegg Name[pl]=Przykładowa wtyczka Name[pt]='Plugin' de Exemplo Name[pt_BR]=Plugin de exemplo -Name[sk]=Príkladový doplnok +Name[sk]=Ukážkový doplnok Name[sv]=Exempelinsticksprogram Name[uk]=Приклад додатка Name[x-test]=xxExample Pluginxx diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index 21153d12b..627b8d4a1 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -2,20 +2,27 @@ Name=Dictionary Name[ca]=Diccionari Name[ca@valencia]=Diccionari +Name[cs]=Slovník +Name[da]=Ordbog Name[de]=Wörterbuch Name[en_GB]=Dictionary Name[es]=Diccionario +Name[fi]=Sanasto Name[fr]=Dictionnaire Name[gl]=Dicionario Name[id]=Kamus Name[it]=Dizionario Name[nl]=Woordenboek Name[nn]=Ordliste +Name[pl]=Słownik +Name[pt]=Dicionário Name[pt_BR]=Dicionário Name[sk]=Slovník Name[sv]=Ordlista Name[uk]=Словник Name[x-test]=xxDictionaryxx +Name[zh_CN]=词典 +Name[zh_TW]=Dictionary Type=Service diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 81c118894..6ce94e4cf 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -2,37 +2,51 @@ Name=Google Name[ca]=Google Name[ca@valencia]=Google +Name[cs]=Google +Name[da]=Google Name[de]=Google Name[en_GB]=Google Name[es]=Google +Name[fi]=Google Name[fr]=Google Name[gl]=Google Name[id]=Google Name[it]=Google Name[nl]=Google Name[nn]=Google +Name[pl]=Google +Name[pt]=Google Name[pt_BR]=Google Name[sk]=Google Name[sv]=Google Name[uk]=Google Name[x-test]=xxGooglexx +Name[zh_CN]=Google +Name[zh_TW]=Google Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... +Comment[cs]=Hledat pomocí... +Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[nl]=Zoeken met... Comment[nn]=Søk med … +Comment[pl]=Szukaj z... +Comment[pt]=Procurar com... Comment[pt_BR]=Pesquisar com... Comment[sk]=Hľadať s... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... +Comment[zh_TW]=搜尋… Icon=google.png Type=Service diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index 2d9d2233d..b9127a7f1 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -2,19 +2,27 @@ Name=Open with mpv Name[ca]=Obre amb el «mpv» Name[ca@valencia]=Obri amb el «mpv» +Name[cs]=Otevřít pomocí mpv +Name[da]=Åbn med mpv +Name[de]=Mit mpv öffnen Name[en_GB]=Open with mpv Name[es]=Abrir con mpv +Name[fi]=Avaa mpv:hen Name[fr]=Ouvrir avec mpv Name[gl]=Abrir con mpv Name[id]=Buka dengan mpv Name[it]=Apri con mpv Name[nl]=Met mpv openen Name[nn]=Opna med mpv +Name[pl]=Otwórz w mpv +Name[pt]=Abrir com o 'mpv' Name[pt_BR]=Abrir com o mpv Name[sk]=Otvoriť s mpv Name[sv]=Öppna med mpv Name[uk]=Відкрити за допомогою mpv Name[x-test]=xxOpen with mpvxx +Name[zh_CN]=用 mpv 打开 +Name[zh_TW]=使用 mpv 開啟 Icon=mpv TryExec=mpv diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 4d9e20350..94bb8de41 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -2,37 +2,51 @@ Name=TinEye Name[ca]=TinEye Name[ca@valencia]=TinEye +Name[cs]=TinEye +Name[da]=TinEye Name[de]=TinEye Name[en_GB]=TinEye Name[es]=TinEye +Name[fi]=TinEye Name[fr]=TinEye Name[gl]=TinEye Name[id]=TinEye Name[it]=TinEye Name[nl]=TinEye Name[nn]=TinEye +Name[pl]=TinEye +Name[pt]=TinEye Name[pt_BR]=TinEye Name[sk]=TinEye Name[sv]=TinEye Name[uk]=TinEye Name[x-test]=xxTinEyexx +Name[zh_CN]=TinEye +Name[zh_TW]=TinEye Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... +Comment[cs]=Hledat pomocí... +Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[nl]=Zoeken met... Comment[nn]=Søk med … +Comment[pl]=Szukaj z... +Comment[pt]=Procurar com... Comment[pt_BR]=Pesquisar com... Comment[sk]=Hľadať s... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... +Comment[zh_TW]=搜尋… Icon=tineye.png Type=Service diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 1ad9a7e94..fb7f84a12 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -2,20 +2,27 @@ Name=Translate page Name[ca]=Tradueix la pàgina Name[ca@valencia]=Tradueix la pàgina +Name[cs]=Přeložit stránku +Name[da]=Oversæt side Name[de]=Seite übersetzen Name[en_GB]=Translate page Name[es]=Traducir página +Name[fi]=Käännä sivu Name[fr]=Traduire la page Web Name[gl]=Traducir a páxina Name[id]=Terjemahkan halaman Name[it]=Traduci la pagina Name[nl]=Pagina vertalen Name[nn]=Set om side +Name[pl]=Przetłumacz stronę +Name[pt]=Traduzir a página Name[pt_BR]=Traduzir página Name[sk]=Preložiť stránku Name[sv]=Översätt sida Name[uk]=Перекласти сторінку Name[x-test]=xxTranslate pagexx +Name[zh_CN]=翻译页面 +Name[zh_TW]=翻譯頁面 Icon=translate.png Type=Service diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index 3d4fbd0c7..d7287a89c 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -2,20 +2,27 @@ Name=Validate page Name[ca]=Valida la pàgina Name[ca@valencia]=Valida la pàgina +Name[cs]=Ověřit stránku +Name[da]=Valider side Name[de]=Seite überprüfen Name[en_GB]=Validate page Name[es]=Validar página +Name[fi]=Tarkista sivu Name[fr]=Valider la page Name[gl]=Validar a páxina Name[id]=Validasi halaman Name[it]=Convalida la pagina Name[nl]=Pagina valideren Name[nn]=Valider side +Name[pl]=Potwierdź stronę +Name[pt]=Validar a página Name[pt_BR]=Validar página -Name[sk]=Skontrolovať stránku +Name[sk]=Ohodnotiť stránku Name[sv]=Validera sida Name[uk]=Перевірити достовірність сторінки Name[x-test]=xxValidate pagexx +Name[zh_CN]=校验页面 +Name[zh_TW]=驗證頁面 Icon=w3.png Type=Service diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 0dba03899..b14f5f26d 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -2,37 +2,51 @@ Name=Yandex Name[ca]=Yandex Name[ca@valencia]=Yandex +Name[cs]=Yandex +Name[da]=Yandex Name[de]=Yandex Name[en_GB]=Yandex Name[es]=Yandex +Name[fi]=Yandex Name[fr]=Yandex Name[gl]=Yandex Name[id]=Yandex Name[it]=Yandex Name[nl]=Yandex Name[nn]=Yandex +Name[pl]=Yandex +Name[pt]=Yandex Name[pt_BR]=Yandex Name[sk]=Yandex Name[sv]=Yandex Name[uk]=Яндекс Name[x-test]=xxYandexxx +Name[zh_CN]=Yandex +Name[zh_TW]=Yandex Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... +Comment[cs]=Hledat pomocí... +Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[nl]=Zoeken met... Comment[nn]=Søk med … +Comment[pl]=Szukaj z... +Comment[pt]=Procurar com... Comment[pt_BR]=Pesquisar com... Comment[sk]=Hľadať s... Comment[sv]=Sök med... Comment[uk]=Шукати за допомогою… Comment[x-test]=xxSearch with...xx +Comment[zh_CN]=使用搜索引擎搜索... +Comment[zh_TW]=搜尋… Icon=yandex.png Type=Service diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index 98f3b980a..be904445c 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -2,35 +2,49 @@ Name=Run Action Name[ca]=Executa una acció Name[ca@valencia]=Executa una acció +Name[cs]=Spustit činnost +Name[da]=Kør handling Name[en_GB]=Run Action Name[es]=Ejecutar acción +Name[fi]=Suorita toiminto Name[fr]=Lancer une action Name[gl]=Executar a acción Name[id]=Run Action Name[it]=Esegui azione Name[nl]=Uitvoeractie Name[nn]=Køyr handling +Name[pl]=Wykonaj działanie +Name[pt]=Executar uma Acção Name[pt_BR]=Executar ação Name[sk]=Spustiť akciu Name[sv]=Utför åtgärd Name[uk]=Виконати дію Name[x-test]=xxRun Actionxx +Name[zh_CN]=执行动作 +Name[zh_TW]=執行動作 Comment=Run various actions on sites 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 +Comment[da]=Kør diverse handlinger på steder Comment[en_GB]=Run various actions on sites Comment[es]=Ejecutar varias acciones en sitios +Comment[fi]=Suorita eri toimintoja sivustoilla Comment[fr]=Lancement d'actions diverses sur des sites Web Comment[gl]=Executar varias accións en sitios Comment[id]=Jalankan beberapa aksi pada situs Comment[it]=Esegue numerose azioni nei siti Comment[nl]=Verschillende acties op sites uitvoeren Comment[nn]=Køyr ymse handlingar på nettstadar +Comment[pl]=Wykonuj różne działania na stronach +Comment[pt]=Executar várias acções sobre as páginas Comment[pt_BR]=Executar várias ações nos sites Comment[sk]=Spustiť rôzne akcie na stránkach Comment[sv]=Utför diverse åtgärder på webbplatser Comment[uk]=Виконання різноманітних дій на сайтах Comment[x-test]=xxRun various actions on sitesxx +Comment[zh_CN]=在站点上运行各种动作 +Comment[zh_TW]=在網站上執行各種動作 Icon=icon.svg Type=Service