From 2743002b2da1535b4e83cb5fb0f64c99cd6a2042 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 25 Mar 2019 08:53:45 +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 | 4 ++++ src/scripts/helloqml/metadata.desktop | 4 ++++ src/scripts/middleclickloader/metadata.desktop | 4 ++++ src/scripts/runaction/actions/googleimagesearch.desktop | 1 + 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 ++ 10 files changed, 22 insertions(+) diff --git a/src/plugins/KDEFrameworksIntegration/metadata.desktop b/src/plugins/KDEFrameworksIntegration/metadata.desktop index dfbcfc351..203ee42f3 100644 --- a/src/plugins/KDEFrameworksIntegration/metadata.desktop +++ b/src/plugins/KDEFrameworksIntegration/metadata.desktop @@ -2,6 +2,8 @@ Name=KDE Frameworks Integration Name[ca]=Integració amb els Frameworks del KDE Name[ca@valencia]=Integració amb els Frameworks del KDE +Name[en_GB]=KDE Frameworks Integration +Name[fr]=Intégration à KDE Frameworks Name[gl]=Integración coas infraestruturas de KDE Name[id]=KDE Frameworks Integration Name[nl]=KDE Frameworks integratie @@ -14,6 +16,8 @@ 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[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar les contrasenyes al KWallet +Comment[en_GB]=Provides support for KIO and storing passwords in KWallet +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 Comment[nl]=Biedt ondersteuning voor KIO en opslaan van wachtwoorden in KWallet diff --git a/src/scripts/helloqml/metadata.desktop b/src/scripts/helloqml/metadata.desktop index 27af73919..4b4dc5593 100644 --- a/src/scripts/helloqml/metadata.desktop +++ b/src/scripts/helloqml/metadata.desktop @@ -2,6 +2,8 @@ Name=Hello Qml Name[ca]=Hola QML Name[ca@valencia]=Hola QML +Name[en_GB]=Hello QML +Name[fr]=Bonjour Qml Name[gl]=Ola Qml Name[id]=Hello Qml Name[nl]=Hello Qml @@ -13,6 +15,8 @@ Name[x-test]=xxHello Qmlxx Comment=Sample Qml Plugin Comment[ca]=Connector QML d'exemple Comment[ca@valencia]=Connector QML d'exemple +Comment[en_GB]=Sample QML Plugin +Comment[fr]=Exemple de module externe Qml Comment[gl]=Complemento de exemplo de Qml Comment[id]=Contoh Plugin Qml Comment[nl]=Voorbeeld Qml-plug-in diff --git a/src/scripts/middleclickloader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop index 948c690b2..6417eabce 100644 --- a/src/scripts/middleclickloader/metadata.desktop +++ b/src/scripts/middleclickloader/metadata.desktop @@ -2,6 +2,8 @@ Name=MiddleClickLoader Name[ca]=MiddleClickLoader Name[ca@valencia]=MiddleClickLoader +Name[en_GB]=MiddleClickLoader +Name[fr]=MiddleClickLoader Name[gl]=MiddleClickLoader Name[id]=MiddleClickLoader Name[nl]=MiddleClickLoader @@ -14,6 +16,8 @@ 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[ca@valencia]=Carrega text com a URL en una selecció del porta-retalls +Comment[en_GB]=Load text in selection clipboard as URL +Comment[fr]=Charger l'URL sélectionnée dans le presse-papier 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 diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index 419b0dcdb..483e694ee 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -20,6 +20,7 @@ Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... +Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... diff --git a/src/scripts/runaction/actions/mpv.desktop b/src/scripts/runaction/actions/mpv.desktop index ec4ef8d67..d5a01980b 100644 --- a/src/scripts/runaction/actions/mpv.desktop +++ b/src/scripts/runaction/actions/mpv.desktop @@ -3,6 +3,7 @@ Name=Open with mpv Name[ca]=Obre amb el «mpv» Name[ca@valencia]=Obri amb el «mpv» Name[en_GB]=Open with mpv +Name[fr]=Ouvrir avec mpv Name[gl]=Abrir con mpv Name[id]=Buka dengan mpv Name[it]=Apri con mpv diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index a1b29b542..0467044ab 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -4,6 +4,7 @@ Name[ca]=TinEye Name[ca@valencia]=TinEye Name[de]=TinEye Name[en_GB]=TinEye +Name[fr]=TinEye Name[gl]=TinEye Name[id]=TinEye Name[it]=TinEye @@ -19,6 +20,7 @@ Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... +Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 621f3519c..9a5fc610c 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -4,6 +4,7 @@ Name[ca]=Tradueix la pàgina Name[ca@valencia]=Tradueix la pàgina Name[de]=Seite übersetzen Name[en_GB]=Translate page +Name[fr]=Traduire la page Web Name[gl]=Traducir a páxina Name[id]=Terjemahkan halaman Name[it]=Traduci la pagina diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index ce883fd2d..117746f22 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -4,6 +4,7 @@ Name[ca]=Valida la pàgina Name[ca@valencia]=Valida la pàgina Name[de]=Seite überprüfen Name[en_GB]=Validate page +Name[fr]=Valider la page Name[gl]=Validar a páxina Name[id]=Validasi halaman Name[it]=Convalida la pagina diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index dcefe06c8..d9eec8851 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -4,6 +4,7 @@ Name[ca]=Yandex Name[ca@valencia]=Yandex Name[de]=Yandex Name[en_GB]=Yandex +Name[fr]=Yandex Name[gl]=Yandex Name[id]=Yandex Name[it]=Yandex @@ -19,6 +20,7 @@ Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... Comment[de]=Suchen mit ... Comment[en_GB]=Search with... +Comment[fr]=Chercher avec… Comment[gl]=Buscar con… Comment[id]=Cari dengan... Comment[it]=Cerca con... diff --git a/src/scripts/runaction/metadata.desktop b/src/scripts/runaction/metadata.desktop index c9010d7eb..e2fb8428e 100644 --- a/src/scripts/runaction/metadata.desktop +++ b/src/scripts/runaction/metadata.desktop @@ -3,6 +3,7 @@ Name=Run Action Name[ca]=Executa una acció Name[ca@valencia]=Executa una acció Name[en_GB]=Run Action +Name[fr]=Lancer une action Name[gl]=Executar a acción Name[id]=Run Action Name[it]=Esegui azione @@ -17,6 +18,7 @@ Comment=Run various actions on sites Comment[ca]=Executa diverses accions als llocs Comment[ca@valencia]=Executa diverses accions als llocs Comment[en_GB]=Run various actions on sites +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