From d1400db7d6696c1936b3183b64c51fe2ec3be78c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 5 Aug 2018 05:29:00 +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" --- src/lib/adblock/metadata.desktop | 2 ++ src/plugins/KDEFrameworksIntegration/metadata.desktop | 2 ++ src/scripts/hellopython/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 ++ 12 files changed, 20 insertions(+) diff --git a/src/lib/adblock/metadata.desktop b/src/lib/adblock/metadata.desktop index 84c67539a..95dd3edd1 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[fi]=Mainosesto Name[fr]=AdBlock Name[gl]=Bloqueador de publicidade Name[id]=AdBlock @@ -28,6 +29,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[fi]=Estää epätoivotun verkkosisällön Comment[fr]=Blocage des contenus Web indésirables Comment[gl]=Bloquea contenido web non desexado Comment[id]=Memblokir konten web yang tak diinginkan diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index feadea83a..037e235ad 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -6,6 +6,7 @@ Name[cs]=Integrace KDE Frameworks Name[da]=KDE Frameworks integration Name[en_GB]=KDE Frameworks Integration Name[es]=Integración con la infraestructura de KDE +Name[fi]=KDE Frameworks -integrointi Name[fr]=Intégration à KDE Frameworks Name[gl]=Integración coas infraestruturas de KDE Name[id]=KDE Frameworks Integration @@ -24,6 +25,7 @@ Comment[cs]=Poskytuje podporu pro KIO a ukládání hesel v Kwallet Comment[da]=Giver understøttelse af KIO og lagring af adgangskoder i KWallet Comment[en_GB]=Provides support for KIO and storing passwords in KWallet Comment[es]=Implementa KIO y almacenamiento de contraseñas en KWallet +Comment[fi]=Tarjoaa KIO-tuen sekä salasanojen tallentamisen KWalletiin Comment[fr]=Prise en charge de KIO et de l'enregistrement de mots de passe dans KWallet Comment[gl]=Fornece compatibilidade con KIO e permite almacenar contrasinais en KWallet Comment[id]=Menyediakan dukungan untuk KIO dan menyimpan sandi dalam KWallet diff --git a/src/scripts/hellopython/metadata.desktop b/src/scripts/hellopython/metadata.desktop index a1f2ccd45..3c8088354 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[fi]=Hei Python Name[fr]=Hello Python Name[gl]=Ola, Python! Name[id]=Hello Python @@ -27,6 +28,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[fi]=Esimerkinomainen Python-laajennus Comment[fr]=Exemple d'extension Python Comment[gl]=Extensión de Python de exemplo Comment[id]=Contoh ekstensi Python diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index a98194050..eb5610ea0 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -4,6 +4,7 @@ Name[ca]=MiddleClickLoader Name[ca@valencia]=MiddleClickLoader Name[cs]=Načtení prostředním tlačítkem myši Name[es]=Cargador de clic central +Name[fi]=Keskipainikelatain Name[fr]=MiddleClickLoader Name[it]=Caricatore al clic centrale Name[nl]=MiddleClickLoader @@ -15,6 +16,7 @@ Comment=Load text in selection clipboard as URL 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 +Comment[fi]=Lataa leikepöytävalinnan tekstin verkko-osoitteeksi Comment[fr]=Charger l'URL sélectionnée dans le presse-papier Comment[it]=Carica come URL il testo negli appunti della selezione Comment[nl]=Tekst laden in selectieklembord als URL diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index d58fc92cc..87864425a 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[fi]=Sanasto Name[fr]=Dictionnaire Name[gl]=Dicionario Name[id]=Kamus diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 2e475d13d..f52b9b084 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[fi]=Google Name[fr]=Google Name[gl]=Google Name[id]=Google @@ -26,6 +27,7 @@ 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... diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index 5b113fbbe..7677ed518 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -6,6 +6,7 @@ Name[cs]=Otevřít pomocí mpv Name[da]=Åbn med mpv 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 diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 8ac9728ec..c71fff014 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[fi]=TinEye Name[fr]=TinEye Name[gl]=TinEye Name[id]=TinEye @@ -26,6 +27,7 @@ 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... diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 838b365f3..5bce94531 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[fi]=Käännä sivu Name[fr]=Traduire la page Web Name[gl]=Traducir a páxina Name[id]=Terjemahkan halaman diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index ee0fd0117..6b248c2be 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[fi]=Tarkista sivu Name[fr]=Valider la page Name[gl]=Validar a páxina Name[id]=Validasi halaman diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 49db7cac6..815cc94ac 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[fi]=Yandex Name[fr]=Yandex Name[gl]=Yandex Name[id]=Yandex @@ -26,6 +27,7 @@ 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... diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index 59d1da76a..98be870c3 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -6,6 +6,7 @@ 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 @@ -24,6 +25,7 @@ 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