From 524697d1391820b47da98f01ac737fe0f4082308 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 27 Jan 2019 05:34:59 +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 | 3 +++ src/lib/adblock/metadata.desktop | 2 ++ src/lib/data/breeze-fallback/index.theme | 1 + src/plugins/AutoScroll/metadata.desktop | 1 + src/plugins/FlashCookieManager/metadata.desktop | 1 + src/plugins/GreaseMonkey/metadata.desktop | 1 + src/plugins/KDEFrameworksIntegration/metadata.desktop | 1 + src/plugins/PIM/metadata.desktop | 1 + src/plugins/StatusBarIcons/metadata.desktop | 1 + src/plugins/TabManager/metadata.desktop | 1 + src/plugins/TestPlugin/metadata.desktop | 1 + src/plugins/VerticalTabs/metadata.desktop | 1 + src/scripts/hellopython/metadata.desktop | 1 + src/scripts/helloqml/metadata.desktop | 1 + src/scripts/middleclickloader/metadata.desktop | 1 + 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 | 1 + themes/chrome/metadata.desktop | 1 + themes/linux/metadata.desktop | 1 + themes/mac/metadata.desktop | 1 + themes/windows/metadata.desktop | 1 + 27 files changed, 33 insertions(+) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index 1c466fc3a..21e71856e 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -46,6 +46,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ý prehliadač internetu Comment[sv]=En snabb och säker webbläsare Comment[uk]=Проста і безпечна програма для перегляду інтернету Comment[x-test]=xxA fast and secure web browserxx @@ -130,6 +131,7 @@ Name[nn]=Opna nytt vindauge Name[pl]=Otwórz nowe okno Name[pt]=Abrir uma nova janela Name[pt_BR]=Abrir nova janela +Name[sk]=Otvoriť nové okno Name[sv]=Öppna nytt fönster Name[uk]=Відкрити нове вікно Name[x-test]=xxOpen new windowxx @@ -157,6 +159,7 @@ Name[nn]=Start privat nettlesing Name[pl]=Rozpocznij prywatne przeglądanie Name[pt]=Iniciar a navegação privada Name[pt_BR]=Iniciar navegação privada +Name[sk]=Začať súkromné prehliadanie Name[sv]=Starta privat webbläsning Name[uk]=Конфіденційний перегляд Name[x-test]=xxStart private browsingxx diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index 573854e73..f40247487 100644 --- a/src/lib/adblock/metadata.desktop +++ b/src/lib/adblock/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Reklamefilter Name[pl]=AdBlock Name[pt]=AdBlock Name[pt_BR]=AdBlock +Name[sk]=AdBlock Name[sv]=Reklamblockering Name[uk]=Блокування реклами Name[x-test]=xxAdBlockxx @@ -40,6 +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 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 5a23bb7fb..bf25931e2 100644 --- a/src/lib/data/breeze-fallback/index.theme +++ b/src/lib/data/breeze-fallback/index.theme @@ -43,6 +43,7 @@ Comment[nn]=Breeze-laget Comment[pl]=Zespół Bryzy Comment[pt]=Equipa do Brisa Comment[pt_BR]=Equipe Breeze +Comment[sk]=Breeze Team Comment[sv]=Breeze-gruppen Comment[uk]=Команда Breeze Comment[x-test]=xxBreeze Teamxx diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index 0b7d76ab6..1e44b513d 100644 --- a/src/plugins/AutoScroll/metadata.desktop +++ b/src/plugins/AutoScroll/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Autorulling Name[pl]=Samoprzewijanie Name[pt]=Deslocamento Automático Name[pt_BR]=AutoScroll +Name[sk]=Automatické posúvanie Name[sv]=Rulla automatiskt Name[uk]=Автогортання Name[x-test]=xxAutoScrollxx diff --git a/src/plugins/FlashCookieManager/metadata.desktop b/src/plugins/FlashCookieManager/metadata.desktop index da9c22c66..1b1b26e4e 100644 --- a/src/plugins/FlashCookieManager/metadata.desktop +++ b/src/plugins/FlashCookieManager/metadata.desktop @@ -17,6 +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 pre Flash Cookie Name[sv]=Flash kakhanterare Name[uk]=Керування куками Flash Name[x-test]=xxFlash Cookie Managerxx diff --git a/src/plugins/GreaseMonkey/metadata.desktop b/src/plugins/GreaseMonkey/metadata.desktop index 79362c5b8..b45368dfd 100644 --- a/src/plugins/GreaseMonkey/metadata.desktop +++ b/src/plugins/GreaseMonkey/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=GreaseMonkey Name[pl]=GreaseMonkey Name[pt]=GreaseMonkey Name[pt_BR]=GreaseMonkey +Name[sk]=GreaseMonkey Name[sv]=GreaseMonkey Name[uk]=GreaseMonkey Name[x-test]=xxGreaseMonkeyxx diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index ecc7c26f9..4dd9ead70 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Integrering med KDE Frameworks Name[pl]=Integracja ze Szkieletami KDE Name[pt]=Integração com as Plataformas do KDE Name[pt_BR]=Integração com o KDE Frameworks +Name[sk]=KDE Frameworks Integrácia Name[sv]=Integration med KDE Ramverk Name[uk]=Інтерграція із KDE Frameworks Name[x-test]=xxKDE Frameworks Integrationxx diff --git a/src/plugins/PIM/metadata.desktop b/src/plugins/PIM/metadata.desktop index da46ea123..f8b013ab8 100644 --- a/src/plugins/PIM/metadata.desktop +++ b/src/plugins/PIM/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=PIM Name[pl]=ZIO Name[pt]=PIM Name[pt_BR]=PIM +Name[sk]=PIM Name[sv]=Personlig information Name[uk]=Керування інформацією Name[x-test]=xxPIMxx diff --git a/src/plugins/StatusBarIcons/metadata.desktop b/src/plugins/StatusBarIcons/metadata.desktop index b6d96d5d8..92c09d943 100644 --- a/src/plugins/StatusBarIcons/metadata.desktop +++ b/src/plugins/StatusBarIcons/metadata.desktop @@ -17,6 +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]=StatusBar Ikony Name[sv]=Ikoner i statusraden Name[uk]=Піктограми смужки стану Name[x-test]=xxStatusBar Iconsxx diff --git a/src/plugins/TabManager/metadata.desktop b/src/plugins/TabManager/metadata.desktop index 1d9764ad2..da9910984 100644 --- a/src/plugins/TabManager/metadata.desktop +++ b/src/plugins/TabManager/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Fanehandsamar Name[pl]=Zarządzanie kartami Name[pt]=Gestor de Páginas Name[pt_BR]=Gerenciador de guias +Name[sk]=Správca kariet Name[sv]=Flikhanterare Name[uk]=Керування вкладками Name[x-test]=xxTab Managerxx diff --git a/src/plugins/TestPlugin/metadata.desktop b/src/plugins/TestPlugin/metadata.desktop index c7c782b5a..632967388 100644 --- a/src/plugins/TestPlugin/metadata.desktop +++ b/src/plugins/TestPlugin/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Eksempel-tillegg Name[pl]=Przykładowa wtyczka Name[pt]='Plugin' de Exemplo Name[pt_BR]=Plugin de exemplo +Name[sk]=Ukážkový doplnok Name[sv]=Exempelinsticksprogram Name[uk]=Приклад додатка Name[x-test]=xxExample Pluginxx diff --git a/src/plugins/VerticalTabs/metadata.desktop b/src/plugins/VerticalTabs/metadata.desktop index ee0e30dcf..8201b5226 100644 --- a/src/plugins/VerticalTabs/metadata.desktop +++ b/src/plugins/VerticalTabs/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Loddrette faner Name[pl]=Pionowe karty Name[pt]=Páginas Verticais Name[pt_BR]=Guias verticais +Name[sk]=Vertikálne karty Name[sv]=Vertikala flikar Name[uk]=Вертикальні вкладки Name[x-test]=xxVertical Tabsxx diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index 3ac956c0f..a35b32d9d 100644 --- a/src/scripts/hellopython/metadata.desktop +++ b/src/scripts/hellopython/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Hei-Python Name[pl]=Witaj Python Name[pt]=Olá em Python Name[pt_BR]=Olá Python +Name[sk]=Hello Python Name[sv]=Hej Python Name[uk]=Привіт, Python Name[x-test]=xxHello Pythonxx diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index b26abb5ec..351ee793d 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -15,6 +15,7 @@ Name[nl]=Hello Qml Name[pl]=Hello Qml Name[pt]=Olá em QML Name[pt_BR]=Olá Qml +Name[sk]=Hello Qml Name[sv]=Hallå QML Name[uk]=Привіт, Qml Name[x-test]=xxHello Qmlxx diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 6436aefc3..dbdef5f01 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -16,6 +16,7 @@ Name[nn]=Lasting med midtklikk Name[pl]=MiddleClickLoader Name[pt]=CarregadorBotãoMeio Name[pt_BR]=CarregadorBotãoMeio +Name[sk]=MiddleClickLoader Name[sv]=Mittenklicksinläsning Name[uk]=Завантажувач за клацанням середньою Name[x-test]=xxMiddleClickLoaderxx diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index 95f4e1353..627b8d4a1 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -17,6 +17,7 @@ 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 diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 5c8b339d0..6ce94e4cf 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -17,6 +17,7 @@ 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 @@ -40,6 +41,7 @@ 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 diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index bd094cecd..b9127a7f1 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -17,6 +17,7 @@ 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 diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 071c7328f..94bb8de41 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -17,6 +17,7 @@ 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 @@ -40,6 +41,7 @@ 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 diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 6eb392060..fb7f84a12 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -17,6 +17,7 @@ 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 diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index d7ee51ffc..d7287a89c 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -17,6 +17,7 @@ Name[nn]=Valider side Name[pl]=Potwierdź stronę Name[pt]=Validar a página Name[pt_BR]=Validar página +Name[sk]=Ohodnotiť stránku Name[sv]=Validera sida Name[uk]=Перевірити достовірність сторінки Name[x-test]=xxValidate pagexx diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index e3d5e4d33..b14f5f26d 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -17,6 +17,7 @@ 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 @@ -40,6 +41,7 @@ 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 diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index d50100d2f..c146aa7d5 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -16,6 +16,7 @@ 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 diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index a9a4932ed..aa0ea9d6c 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Chrome Name[pl]=Chrome Name[pt]=Chrome Name[pt_BR]=Chrome +Name[sk]=Chrome Name[sv]=Chrome Name[uk]=Хромування Name[x-test]=xxChromexx diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index e6186ef21..7b6a2fdcf 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Linux Name[pl]=Linux Name[pt]=Linux Name[pt_BR]=Linux +Name[sk]=Linux Name[sv]=Linux Name[uk]=Linux Name[x-test]=xxLinuxxx diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index 000edbd00..a1a48caa9 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Mac Name[pl]=Mac Name[pt]=Mac Name[pt_BR]=Mac +Name[sk]=Mac Name[sv]=Mac Name[uk]=Mac Name[x-test]=xxMacxx diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index f2671ce17..225068a62 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -17,6 +17,7 @@ Name[nn]=Windows Name[pl]=Windows Name[pt]=Windows Name[pt_BR]=Windows +Name[sk]=Windows Name[sv]=Windows Name[uk]=Windows Name[x-test]=xxWindowsxx