From f712500b2c40e078d1603f2fed044ce711681612 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 23 Mar 2019 09:02:28 +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" --- src/plugins/KDEFrameworksIntegration/metadata.desktop | 8 ++++++++ src/scripts/helloqml/metadata.desktop | 6 ++++++ src/scripts/middleclickloader/metadata.desktop | 7 +++++++ src/scripts/runaction/actions/dictionary.desktop | 4 ++++ src/scripts/runaction/actions/googleimagesearch.desktop | 8 ++++++++ src/scripts/runaction/actions/mpv.desktop | 4 ++++ src/scripts/runaction/actions/tineyeimagesearch.desktop | 8 ++++++++ src/scripts/runaction/actions/translate.desktop | 4 ++++ src/scripts/runaction/actions/w3.desktop | 4 ++++ src/scripts/runaction/actions/yandeximagesearch.desktop | 8 ++++++++ src/scripts/runaction/metadata.desktop | 8 ++++++++ 11 files changed, 69 insertions(+) diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index c70d802c8..24ef53465 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -1,15 +1,23 @@ [Desktop Entry] Name=KDE Frameworks Integration Name[ca]=Integració amb els Frameworks del KDE +Name[gl]=Integración coas infraestruturas de KDE Name[id]=KDE Frameworks Integration Name[nl]=KDE Frameworks integratie +Name[nn]=Integrering med KDE Frameworks +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 Comment=Provides support for KIO and storing passwords in KWallet Comment[ca]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet +Comment[gl]=Fornece compatibilidade con KIO e permite almacenar contrasinais en KWallet Comment[id]=Menyediakan dukungan untuk KIO dan menyimpan sandi dalam KWallet Comment[nl]=Biedt ondersteuning voor KIO en opslaan van wachtwoorden in KWallet +Comment[nn]=Gjev støtte for KIO og lagring av passord i KWallet +Comment[pt_BR]=Fornece suporte ao KIO e armazenamento de senhas no KWallet +Comment[sk]=Poskytuje podporu pre KIO a ukladanie hesiel do KWalletu Comment[sv]=Tillhandahåller stöd för KIO och lagring av lösenord i plånboken Comment[uk]=Забезпечує підтримку засобів введення-виведення KIO і зберігання паролів у KWallet Comment[x-test]=xxProvides support for KIO and storing passwords in KWalletxx diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 30c538d45..560b13bdb 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -1,15 +1,21 @@ [Desktop Entry] Name=Hello Qml Name[ca]=Hola QML +Name[gl]=Ola Qml Name[id]=Hello Qml Name[nl]=Hello Qml +Name[pt_BR]=Olá Qml +Name[sk]=Hello Qml Name[sv]=Hallå QML Name[uk]=Привіт, Qml Name[x-test]=xxHello Qmlxx Comment=Sample Qml Plugin Comment[ca]=Connector QML d'exemple +Comment[gl]=Complemento de exemplo de Qml Comment[id]=Contoh Plugin Qml Comment[nl]=Voorbeeld Qml-plug-in +Comment[pt_BR]=Plug-in QML de exemplo +Comment[sk]=Ukážkový QML plugin Comment[sv]=Exempel på QML-insticksprogram Comment[uk]=Зразок додатка Qml Comment[x-test]=xxSample Qml Pluginxx diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 1472309e4..31f879129 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -1,15 +1,22 @@ [Desktop Entry] Name=MiddleClickLoader Name[ca]=MiddleClickLoader +Name[gl]=MiddleClickLoader Name[id]=MiddleClickLoader Name[nl]=MiddleClickLoader +Name[nn]=Lasting med midtklikk +Name[pt_BR]=CarregadorBotãoMeio +Name[sk]=MiddleClickLoader Name[sv]=Mittenklicksinläsning Name[uk]=Завантажувач за клацанням середньою Name[x-test]=xxMiddleClickLoaderxx Comment=Load text in selection clipboard as URL Comment[ca]=Carrega text com a URL en una selecció del porta-retalls +Comment[gl]=Cargar texto no portapapeis de selección como URL Comment[id]=Muat teks dalam seleksi clipboard sebagai URL Comment[nl]=Tekst laden in selectieklembord als URL +Comment[pt_BR]=Carrega o texto na área de transferência como uma URL +Comment[sk]=Načítať text vo výbere schránky ako URL Comment[sv]=Läs in text markerad på klippbordet som webbadress Comment[uk]=Завантажує текст у буфері обміну як адресу Comment[x-test]=xxLoad text in selection clipboard as URLxx diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index 8a86117c0..72aa5c894 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -4,9 +4,13 @@ Name[ca]=Diccionari Name[de]=Wörterbuch Name[en_GB]=Dictionary Name[fr]=Dictionnaire +Name[gl]=Dicionario Name[id]=Kamus Name[it]=Dizionario Name[nl]=Woordenboek +Name[nn]=Ordliste +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 b03d084ea..533db5639 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -4,9 +4,13 @@ Name[ca]=Google Name[de]=Google Name[en_GB]=Google Name[fr]=Google +Name[gl]=Google Name[id]=Google Name[it]=Google Name[nl]=Google +Name[nn]=Google +Name[pt_BR]=Google +Name[sk]=Google Name[sv]=Google Name[uk]=Google Name[x-test]=xxGooglexx @@ -14,9 +18,13 @@ Comment=Search with... Comment[ca]=Cerca amb... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... +Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[nl]=Zoeken met... +Comment[nn]=Søk med … +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 1f59daf0d..d2af5a0db 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -2,9 +2,13 @@ Name=Open with mpv Name[ca]=Obre amb el «mpv» Name[en_GB]=Open with 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[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 980e62182..2dd98b34f 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -3,9 +3,13 @@ Name=TinEye Name[ca]=TinEye Name[de]=TinEye Name[en_GB]=TinEye +Name[gl]=TinEye Name[id]=TinEye Name[it]=TinEye Name[nl]=TinEye +Name[nn]=TinEye +Name[pt_BR]=TinEye +Name[sk]=TinEye Name[sv]=TinEye Name[uk]=TinEye Name[x-test]=xxTinEyexx @@ -13,9 +17,13 @@ Comment=Search with... Comment[ca]=Cerca amb... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... +Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[nl]=Zoeken met... +Comment[nn]=Søk med … +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 a6e5eb5d1..976b5c513 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -3,9 +3,13 @@ Name=Translate page Name[ca]=Tradueix la pàgina Name[de]=Seite übersetzen Name[en_GB]=Translate page +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[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 2649ecae8..ceae68d9b 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -3,9 +3,13 @@ Name=Validate page Name[ca]=Valida la pàgina Name[de]=Seite überprüfen Name[en_GB]=Validate 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[pt_BR]=Validar página +Name[sk]=Skontrolovať 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 0b7b2db2a..7d580c734 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -3,9 +3,13 @@ Name=Yandex Name[ca]=Yandex Name[de]=Yandex Name[en_GB]=Yandex +Name[gl]=Yandex Name[id]=Yandex Name[it]=Yandex Name[nl]=Yandex +Name[nn]=Yandex +Name[pt_BR]=Yandex +Name[sk]=Yandex Name[sv]=Yandex Name[uk]=Яндекс Name[x-test]=xxYandexxx @@ -13,9 +17,13 @@ Comment=Search with... Comment[ca]=Cerca amb... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... +Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... Comment[nl]=Zoeken met... +Comment[nn]=Søk med … +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 3091ef7a9..0da549434 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -2,18 +2,26 @@ Name=Run Action Name[ca]=Executa una acció Name[en_GB]=Run Action +Name[gl]=Executar a acción Name[id]=Run Action Name[it]=Esegui azione Name[nl]=Uitvoeractie +Name[nn]=Køyr handling +Name[pt_BR]=Executar ação +Name[sk]=Spustiť akciu Name[sv]=Utför åtgärd Name[uk]=Виконати дію Name[x-test]=xxRun Actionxx Comment=Run various actions on sites Comment[ca]=Executa diverses accions als llocs Comment[en_GB]=Run various actions on sites +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[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