From c2b43505215aa6d50d02acae68047c2a1e21e17f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 3 Dec 2019 05:37:17 +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 18db0aff0..1a2cf50d7 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -8,6 +8,7 @@ Name[da]=Falkon Name[de]=Falkon Name[en_GB]=Falkon Name[es]=Falkon +Name[et]=Falkon Name[fi]=Falkon Name[fr]=Falkon Name[gl]=Falkon @@ -39,6 +40,7 @@ Comment[da]=En hurtig og sikker webbrowser Comment[de]=Ein schneller und sicherer Webbrowser Comment[en_GB]=A fast and secure web browser Comment[es]=Un navegador web rápido y seguro +Comment[et]=Kiire ja turvaline veebilehitseja Comment[fi]=Nopea ja turvallinen verkkoselain Comment[fr]=Un navigateur Web rapide et sécurisé Comment[gl]=Un navegador rápido e seguro @@ -66,6 +68,7 @@ GenericName[da]=Webbrowser GenericName[de]=Webbrowser GenericName[en_GB]=Web Browser GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja GenericName[fi]=Verkkoselain GenericName[fr]=Navigateur Web GenericName[gl]=Navegador web @@ -100,6 +103,7 @@ Name[da]=Åbn nyt faneblad Name[de]=Neues Unterfenster öffnen Name[en_GB]=Open new tab Name[es]=Abrir nueva pestaña +Name[et]=Uue kaardi avamine Name[fi]=Avaa uusi välilehti Name[fr]=Ouvrir un nouvel onglet Name[gl]=Abrir unha lapela nova @@ -131,6 +135,7 @@ Name[da]=Åbn nyt vindue Name[de]=Neues Fenster öffnen Name[en_GB]=Open new window Name[es]=Abrir nueva ventana +Name[et]=Uue akna avamine Name[fi]=Avaa uusi ikkuna Name[fr]=Ouvrir une nouvelle fenêtre Name[gl]=Abrir unha xanela nova @@ -162,6 +167,7 @@ Name[da]=Start privat browsing Name[de]=Im privaten Browsermodus starten Name[en_GB]=Start private browsing Name[es]=Iniciar navegación privada +Name[et]=Privaatse lehitsemise alustamine Name[fi]=Aloita yksityisselaus Name[fr]=Démarrer la navigation privée Name[gl]=Iniciar a navegación privada diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index a47295c51..ab8561197 100644 --- a/src/lib/adblock/metadata.desktop +++ b/src/lib/adblock/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=AdBlock Name[de]=AdBlock Name[en_GB]=AdBlock Name[es]=AdBlock +Name[et]=AdBlock Name[fi]=Mainosesto Name[fr]=AdBlock Name[gl]=Bloqueador de publicidade @@ -33,6 +34,7 @@ Comment[da]=Blokerer uønskede webindhold Comment[de]=Blockiert unerwünschte Web-Inhalte Comment[en_GB]=Blocks unwanted web content Comment[es]=Bloquea contenido web no deseado +Comment[et]=Soovimatu veebisisu blokkimine Comment[fi]=Estää epätoivotun verkkosisällön Comment[fr]=Blocage des contenus Web indésirables Comment[gl]=Bloquea contenido web non desexado diff --git a/src/lib/data/breeze-fallback/index.theme b/src/lib/data/breeze-fallback/index.theme index 154943f61..c267dcd43 100644 --- a/src/lib/data/breeze-fallback/index.theme +++ b/src/lib/data/breeze-fallback/index.theme @@ -8,6 +8,7 @@ Name[da]=Breeze Name[de]=Breeze Name[en_GB]=Breeze Name[es]=Brisa +Name[et]=Breeze Name[fi]=Breeze Name[fr]=Breeze Name[gl]=Breeze @@ -35,6 +36,7 @@ Comment[da]=Breeze-tema Comment[de]=Breeze-Team Comment[en_GB]=Breeze Team Comment[es]=Equipo de Brisa +Comment[et]=Breeze'i meeskond Comment[fi]=Breeze-työryhmä Comment[fr]=L'équipe de Breeze Comment[gl]=Equipo de Breeze diff --git a/src/plugins/AutoScroll/metadata.desktop b/src/plugins/AutoScroll/metadata.desktop index fc5892fcd..2159fc04d 100644 --- a/src/plugins/AutoScroll/metadata.desktop +++ b/src/plugins/AutoScroll/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=Autorul Name[de]=Automatischer Bildlauf Name[en_GB]=AutoScroll Name[es]=Desplazamiento automático +Name[et]=Automaatne kerimine Name[fi]=Automaattivieritys Name[fr]=AutoScroll Name[gl]=Desprazamento automático @@ -33,6 +34,7 @@ Comment[da]=Giver understøttelse af autorul med den midterste museknap Comment[de]=Automatisches Blättern mit der mittleren Maustaste Comment[en_GB]=Provides support for autoscroll with middle mouse button Comment[es]=Implementa ell desplazamiento automático con el botón medio del ratón +Comment[et]=Automaatse kerimise toetus hiire keskmise nupuga Comment[fi]=Tarjoaa automaattivieritystuen hiiren keskipainikkeelle Comment[fr]=Prise en charge du défilement automatique à l'aide du bouton central de la souris Comment[gl]=Fornece a funcionalidade de desprazamento automático co botón central diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index fa68c2590..a3a82a75f 100644 --- a/src/scripts/hellopython/metadata.desktop +++ b/src/scripts/hellopython/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=Hallo Python Name[de]=Hallo-Python Name[en_GB]=Hello Python Name[es]=Hola Python +Name[et]=Tere Python Name[fi]=Hei Python Name[fr]=Hello Python Name[gl]=Ola, Python! @@ -33,6 +34,7 @@ Comment[da]=Eksempel Python-udvidelse Comment[de]=Beispiel eines Python-Moduls Comment[en_GB]=Example Python extension Comment[es]=Ejemplo de extensión de Python +Comment[et]=Pythoni laienduse näidis Comment[fi]=Esimerkinomainen Python-laajennus Comment[fr]=Exemple d'extension Python Comment[gl]=Extensión de Python de exemplo diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 0156f2964..318e4b7f0 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -6,6 +6,7 @@ Name[cs]=Ahoj QML Name[de]=Hallo QML Name[en_GB]=Hello QML Name[es]=Hola Qml +Name[et]=Tere QML Name[fi]=Hei QML Name[fr]=Bonjour Qml Name[gl]=Ola Qml @@ -31,6 +32,7 @@ Comment[cs]=Ukázkový modul QML Comment[de]=Beispielmodul in Qml Comment[en_GB]=Sample QML Plugin Comment[es]=Complemento de ejemplo de Qml +Comment[et]=QML-i plugina näidis Comment[fi]=Esimerkki-QML-liitännäinen Comment[fr]=Exemple de module externe Qml Comment[gl]=Complemento de exemplo de Qml diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index d720b23fc..1301dcd04 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -6,6 +6,7 @@ Name[cs]=Načtení prostředním tlačítkem myši Name[de]=Mittelklick-Lader Name[en_GB]=MiddleClickLoader Name[es]=Cargador de clic central +Name[et]=Keskklõpsuga laadimine Name[fi]=Keskipainikelatain Name[fr]=MiddleClickLoader Name[gl]=MiddleClickLoader @@ -31,6 +32,7 @@ Comment[cs]=Načíst text ve schránce výběru jako URL Comment[de]=Text in der Auswahl der Zwischenablage als URL laden Comment[en_GB]=Load text in selection clipboard as URL Comment[es]=Cargar texto seleccionado en el portapapeles como URL +Comment[et]=Valitud teksti laadimine lõikepuhvrisse URL-ina Comment[fi]=Lataa leikepöytävalinnan tekstin verkko-osoitteeksi Comment[fr]=Charger l'URL sélectionnée dans le presse-papier Comment[gl]=Cargar texto no portapapeis de selección como URL diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index 0600d428a..325461675 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -7,6 +7,7 @@ Name[da]=Ordbog Name[de]=Wörterbuch Name[en_GB]=Dictionary Name[es]=Diccionario +Name[et]=Sõnaraamat Name[fi]=Sanasto Name[fr]=Dictionnaire Name[gl]=Dicionario diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 952f9d129..4c104a24e 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -7,6 +7,7 @@ Name[da]=Google Name[de]=Google Name[en_GB]=Google Name[es]=Google +Name[et]=Google Name[fi]=Google Name[fr]=Google Name[gl]=Google @@ -33,6 +34,7 @@ Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[et]=Otsimine mootoriga ... Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index ff6df825a..d633197a3 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -7,6 +7,7 @@ Name[da]=Åbn med mpv Name[de]=Mit mpv öffnen Name[en_GB]=Open with mpv Name[es]=Abrir con mpv +Name[et]=Avamine mpv'ga Name[fi]=Avaa mpv:hen Name[fr]=Ouvrir avec mpv Name[gl]=Abrir con mpv diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index b896c3894..d63beff70 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -7,6 +7,7 @@ Name[da]=TinEye Name[de]=TinEye Name[en_GB]=TinEye Name[es]=TinEye +Name[et]=TinEye Name[fi]=TinEye Name[fr]=TinEye Name[gl]=TinEye @@ -33,6 +34,7 @@ Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[et]=Otsimine mootoriga ... Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 00e279bfa..27b84eba7 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -7,6 +7,7 @@ Name[da]=Oversæt side Name[de]=Seite übersetzen Name[en_GB]=Translate page Name[es]=Traducir página +Name[et]=Lehekülje tõlkimine Name[fi]=Käännä sivu Name[fr]=Traduire la page Web Name[gl]=Traducir a páxina diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index b5874d54f..61f5acef7 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -7,6 +7,7 @@ Name[da]=Valider side Name[de]=Seite überprüfen Name[en_GB]=Validate page Name[es]=Validar página +Name[et]=Lehekülje valideerimine Name[fi]=Tarkista sivu Name[fr]=Valider la page Name[gl]=Validar a páxina diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 6a53ed2bf..250bd073b 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -7,6 +7,7 @@ Name[da]=Yandex Name[de]=Yandex Name[en_GB]=Yandex Name[es]=Yandex +Name[et]=Yandex Name[fi]=Yandex Name[fr]=Yandex Name[gl]=Yandex @@ -33,6 +34,7 @@ Comment[da]=Søg med... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[es]=Buscar con... +Comment[et]=Otsimine mootoriga ... Comment[fi]=Etsi hakukoneella… Comment[fr]=Chercher avec… Comment[gl]=Buscar con… diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index 8d1cdaa28..1a64e9192 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=Kør handling Name[de]=Aktion ausführen Name[en_GB]=Run Action Name[es]=Ejecutar acción +Name[et]=Toimingu käivitamine Name[fi]=Suorita toiminto Name[fr]=Lancer une action Name[gl]=Executar a acción @@ -33,6 +34,7 @@ Comment[da]=Kør diverse handlinger på steder Comment[de]=Verschiedene Aktionen auf Webseiten ausführen Comment[en_GB]=Run various actions on sites Comment[es]=Ejecutar varias acciones en sitios +Comment[et]=Mitmesuguste toimingute käivitamine saitidel Comment[fi]=Suorita eri toimintoja sivustoilla Comment[fr]=Lancement d'actions diverses sur des sites Web Comment[gl]=Executar varias accións en sitios diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index d0d62de55..86ed887af 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=Chrome Name[de]=Chrome Name[en_GB]=Chrome Name[es]=Chrome +Name[et]=Chrome Name[fi]=Chrome Name[fr]=Chrome Name[gl]=Chrome @@ -33,6 +34,7 @@ Comment[da]=Chrome-lignende tema til Falkon baseret på Firefox Chromifox-tema Comment[de]=Chrome ähnliches Design für Falkon auf der Basis des Chromifox-Designs von Firefox Comment[en_GB]=Chrome like theme for Falkon based on Firefox Chromifox theme Comment[es]=Tema estilo Chrome para Falkon basado en el tema Firefox Chromifox +Comment[et]=Falkoni Chrome'i meenutav teema, mille aluseks on Firefoxi Chromifoxi teema Comment[fi]=Firefoxin Chromifox-teemaan pohjautuva Chromen kaltainen Falkon-teema Comment[fr]=Thème Chrome pour Falkon inspiré du thème Chromifox de Firefox Comment[gl]=Tema parecido a Chrome para Falkon baseado no tema Chromifox de Firefox diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index 14b2e7a7b..4c5948ca0 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=Linux Name[de]=Linux Name[en_GB]=Linux Name[es]=Linux +Name[et]=Linux Name[fi]=Linux Name[fr]=Linux Name[gl]=Linux @@ -33,6 +34,7 @@ Comment[da]=Standard simpelt tema til Linux som bruger systemets widgetstil og n Comment[de]=Als Vorgabe ein einfaches Design für Linux, das den nativen Stil der Bedienelemente und grundlegende Symbole der Arbeitsfläche verwendet Comment[en_GB]=Default simple theme for Linux using native widget style and some basic icons from desktop icon set Comment[es]=Tema sencillo predeterminado para Linux usando un estilo de controles nativo y algunos iconos básicos desde el conjunto de iconos de escritorio +Comment[et]=Lihtne vaikimisi Linuxi teema, mis kasutab süsteemset vidinastiili ja mõningaid ikoone töölaua ikoonikogust Comment[fi]=Yksinkertainen natiivia elementtityyliä käyttävä Linux-teema sekä joitakin kuvakkeita työpöytäkuvakejoukosta Comment[fr]=Thème simple par défaut pour Linux utilisant les styles de composants graphiques natifs et quelques icônes simples du jeu d'icônes du bureau Comment[gl]=Tema predeterminado simple para Linux que usa o estilo de trebellos nativo e algunhas iconas básicas do grupo de iconas do escritorio diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index 733c2a15f..3c40faf0a 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=Mac Name[de]=Mac Name[en_GB]=Mac Name[es]=Mac +Name[et]=Mac Name[fi]=Mac Name[fr]=Mac Name[gl]=Mac @@ -33,6 +34,7 @@ Comment[da]=Mac-lignende tema til Falkon baseret på Firefox Mac OS X-tema Comment[de]=Mac ähnliches Design für Falkon auf der Basis des „Mac OS X“-Designs von Firefox Comment[en_GB]=Mac like theme for Falkon based on Firefox Mac OS X theme Comment[es]=Tema estilo Mac para Falkon basado en el tema Firefox Mac OS X +Comment[et]=Falkoni Maci meenutav teema, mille aluseks on Firefoxi Mac OS X teema Comment[fi]=Firefoxin Mac OS X -teemaan pohjautuva Macin kaltainen Falkon-teema Comment[fr]=Thème Mac pour Falkon inspiré du thème Mac OS X de Firefox Comment[gl]=Tema parecido a Mac para Falkon baseado no tema de Mac OS X de Firefox diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index b5429055e..b5a86ab3a 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -7,6 +7,7 @@ Name[da]=Windows Name[de]=Windows Name[en_GB]=Windows Name[es]=Windows +Name[et]=Windows Name[fi]=Windows Name[fr]=Windows Name[gl]=Xanelas @@ -33,6 +34,7 @@ Comment[da]=Windows-lignende tema baseret på Material design Comment[de]=Windows ähnliches Design auf der Basis des Designs Material Comment[en_GB]=Windows like theme based on Material design Comment[es]=Tema estilo Windows basado en el diseño Material +Comment[et]=Windowsi meenutav teema, mille aluseks on Materiali disain Comment[fi]=Material-designiin pohjautuva Windowsin kaltainen teema Comment[fr]=Thème Windows inspiré par Material Comment[gl]=Tema parecido a Windows baseado no deseño material