From 91059a3fb3d8faedc7fc44c6078ad9eef1a6ca94 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 22 Mar 2018 05:17:51 +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/GreaseMonkey/metadata.desktop | 1 + src/plugins/KDESupport/metadata.desktop | 2 ++ src/plugins/MouseGestures/metadata.desktop | 1 + src/plugins/PIM/metadata.desktop | 1 + src/plugins/StatusBarIcons/metadata.desktop | 1 + src/plugins/TabManager/metadata.desktop | 1 + src/scripts/runaction/actions/dictionary.desktop | 1 + src/scripts/runaction/actions/googleimagesearch.desktop | 2 ++ 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 ++ themes/chrome/metadata.desktop | 1 + themes/linux/metadata.desktop | 1 + themes/mac/metadata.desktop | 1 + themes/windows/metadata.desktop | 1 + 16 files changed, 20 insertions(+) diff --git a/src/plugins/GreaseMonkey/metadata.desktop b/src/plugins/GreaseMonkey/metadata.desktop index d8da66217..e2831a9ae 100644 --- a/src/plugins/GreaseMonkey/metadata.desktop +++ b/src/plugins/GreaseMonkey/metadata.desktop @@ -2,6 +2,7 @@ Name=GreaseMonkey Name[ca]=GreaseMonkey Name[ca@valencia]=GreaseMonkey +Name[de]=GreaseMonkey Name[en_GB]=GreaseMonkey Name[fi]=GreaseMonkey Name[fr]=GreaseMonkey diff --git a/src/plugins/KDESupport/metadata.desktop b/src/plugins/KDESupport/metadata.desktop index 8ef238d07..e31e9e6b0 100644 --- a/src/plugins/KDESupport/metadata.desktop +++ b/src/plugins/KDESupport/metadata.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Suport pel KDE Name[en_GB]=KDE Support Name[nl]=KDE ondersteuning Name[pt]=Suporte ao KDE +Name[sv]=KDE-stöd Name[uk]=Підтримка KDE Name[x-test]=xxKDE Supportxx Comment=Provides support for KIO and storing passwords in KWallet @@ -13,6 +14,7 @@ Comment[ca@valencia]=Proporciona suport pel KIO i per emmagatzemar contrasenyes Comment[en_GB]=Provides support for KIO and storing passwords in KWallet Comment[nl]=Biedt ondersteuning voor KIO en opslaan van wachtwoorden in KWallet Comment[pt]=Oferece o suporte para o KIO e para guardar as senhas no KWallet +Comment[sv]=Tillhandahåller stöd KIO och för att lagra 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/plugins/MouseGestures/metadata.desktop b/src/plugins/MouseGestures/metadata.desktop index 1d60f38a7..5b6aa985a 100644 --- a/src/plugins/MouseGestures/metadata.desktop +++ b/src/plugins/MouseGestures/metadata.desktop @@ -2,6 +2,7 @@ Name=Mouse Gestures Name[ca]=Gestos del ratolí Name[ca@valencia]=Gestos del ratolí +Name[de]=Maus-Gesten Name[en_GB]=Mouse Gestures Name[fi]=Hiirieleet Name[it]=Gesti del mouse diff --git a/src/plugins/PIM/metadata.desktop b/src/plugins/PIM/metadata.desktop index 5f8390e57..c1dd9841d 100644 --- a/src/plugins/PIM/metadata.desktop +++ b/src/plugins/PIM/metadata.desktop @@ -2,6 +2,7 @@ Name=PIM Name[ca]=PIM Name[ca@valencia]=PIM +Name[de]=PIM Name[en_GB]=PIM Name[fi]=Henkilökohtainen ajanhallinta Name[fr]=PIM diff --git a/src/plugins/StatusBarIcons/metadata.desktop b/src/plugins/StatusBarIcons/metadata.desktop index d0ffc41fc..fe364caba 100644 --- a/src/plugins/StatusBarIcons/metadata.desktop +++ b/src/plugins/StatusBarIcons/metadata.desktop @@ -2,6 +2,7 @@ Name=StatusBar Icons Name[ca]=Icones de la barra d'estat Name[ca@valencia]=Icones de la barra d'estat +Name[de]=Statusleisten-Symbole Name[en_GB]=StatusBar Icons Name[fi]=Tilarivin kuvakkeet Name[it]=Icone della barra di stato diff --git a/src/plugins/TabManager/metadata.desktop b/src/plugins/TabManager/metadata.desktop index 95966bd8b..2057625a5 100644 --- a/src/plugins/TabManager/metadata.desktop +++ b/src/plugins/TabManager/metadata.desktop @@ -2,6 +2,7 @@ Name=Tab Manager Name[ca]=Gestor de pestanyes Name[ca@valencia]=Gestor de pestanyes +Name[de]=Unterfensterverwaltung Name[en_GB]=Tab Manager Name[fi]=Välilehtien hallinta Name[it]=Gestore delle schede diff --git a/src/scripts/runaction/actions/dictionary.desktop b/src/scripts/runaction/actions/dictionary.desktop index c69cad1e4..b6ea38c38 100644 --- a/src/scripts/runaction/actions/dictionary.desktop +++ b/src/scripts/runaction/actions/dictionary.desktop @@ -2,6 +2,7 @@ Name=Dictionary Name[ca]=Diccionari Name[ca@valencia]=Diccionari +Name[de]=Wörterbuch Name[en_GB]=Dictionary Name[fr]=Dictionnaire Name[nl]=Woordenboek diff --git a/src/scripts/runaction/actions/googleimagesearch.desktop b/src/scripts/runaction/actions/googleimagesearch.desktop index cc5937d5d..5345aaed9 100644 --- a/src/scripts/runaction/actions/googleimagesearch.desktop +++ b/src/scripts/runaction/actions/googleimagesearch.desktop @@ -2,6 +2,7 @@ Name=Google Name[ca]=Google Name[ca@valencia]=Google +Name[de]=Google Name[en_GB]=Google Name[fr]=Google Name[nl]=Google @@ -13,6 +14,7 @@ Name[zh_CN]=Google Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... +Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[nl]=Zoeken met... Comment[pt]=Procurar com... diff --git a/src/scripts/runaction/actions/tineyeimagesearch.desktop b/src/scripts/runaction/actions/tineyeimagesearch.desktop index 57d916845..8bc9c19ab 100644 --- a/src/scripts/runaction/actions/tineyeimagesearch.desktop +++ b/src/scripts/runaction/actions/tineyeimagesearch.desktop @@ -2,6 +2,7 @@ Name=TinEye Name[ca]=TinEye Name[ca@valencia]=TinEye +Name[de]=TinEye Name[en_GB]=TinEye Name[nl]=TinEye Name[pt]=TinEye @@ -11,6 +12,7 @@ Name[x-test]=xxTinEyexx Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... +Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[nl]=Zoeken met... Comment[pt]=Procurar com... diff --git a/src/scripts/runaction/actions/translate.desktop b/src/scripts/runaction/actions/translate.desktop index 0ba55f997..041cd467d 100644 --- a/src/scripts/runaction/actions/translate.desktop +++ b/src/scripts/runaction/actions/translate.desktop @@ -2,6 +2,7 @@ Name=Translate page Name[ca]=Tradueix la pàgina Name[ca@valencia]=Tradueix la pàgina +Name[de]=Seite übersetzen Name[en_GB]=Translate page Name[nl]=Pagina vertalen Name[pt]=Traduzir a página diff --git a/src/scripts/runaction/actions/w3.desktop b/src/scripts/runaction/actions/w3.desktop index c17034947..538b5e481 100644 --- a/src/scripts/runaction/actions/w3.desktop +++ b/src/scripts/runaction/actions/w3.desktop @@ -2,6 +2,7 @@ Name=Validate page Name[ca]=Valida la pàgina Name[ca@valencia]=Valida la pàgina +Name[de]=Seite überprüfen Name[en_GB]=Validate page Name[nl]=Pagina valideren Name[pt]=Validar a página diff --git a/src/scripts/runaction/actions/yandeximagesearch.desktop b/src/scripts/runaction/actions/yandeximagesearch.desktop index 5667fafcd..c7c4b01ce 100644 --- a/src/scripts/runaction/actions/yandeximagesearch.desktop +++ b/src/scripts/runaction/actions/yandeximagesearch.desktop @@ -2,6 +2,7 @@ Name=Yandex Name[ca]=Yandex Name[ca@valencia]=Yandex +Name[de]=Yandex Name[en_GB]=Yandex Name[nl]=Yandex Name[pt]=Yandex @@ -11,6 +12,7 @@ Name[x-test]=xxYandexxx Comment=Search with... Comment[ca]=Cerca amb... Comment[ca@valencia]=Cerca amb... +Comment[de]=Suchen mit ... Comment[en_GB]=Search with... Comment[nl]=Zoeken met... Comment[pt]=Procurar com... diff --git a/themes/chrome/metadata.desktop b/themes/chrome/metadata.desktop index 2ad2a7290..4c12a67e4 100644 --- a/themes/chrome/metadata.desktop +++ b/themes/chrome/metadata.desktop @@ -2,6 +2,7 @@ Name=Chrome Name[ca]=Chrome Name[ca@valencia]=Chrome +Name[de]=Chrome Name[en_GB]=Chrome Name[fi]=Chrome Name[it]=Chrome diff --git a/themes/linux/metadata.desktop b/themes/linux/metadata.desktop index 3be07879f..75e0e1ede 100644 --- a/themes/linux/metadata.desktop +++ b/themes/linux/metadata.desktop @@ -2,6 +2,7 @@ Name=Linux Name[ca]=Linux Name[ca@valencia]=Linux +Name[de]=Linux Name[en_GB]=Linux Name[fi]=Linux Name[it]=Linux diff --git a/themes/mac/metadata.desktop b/themes/mac/metadata.desktop index 9af77c84d..17b23d57b 100644 --- a/themes/mac/metadata.desktop +++ b/themes/mac/metadata.desktop @@ -2,6 +2,7 @@ Name=Mac Name[ca]=Mac Name[ca@valencia]=Mac +Name[de]=Mac Name[en_GB]=Mac Name[fi]=Mac Name[it]=Mac diff --git a/themes/windows/metadata.desktop b/themes/windows/metadata.desktop index 346310485..8ba99c257 100644 --- a/themes/windows/metadata.desktop +++ b/themes/windows/metadata.desktop @@ -2,6 +2,7 @@ Name=Windows Name[ca]=Windows Name[ca@valencia]=Windows +Name[de]=Windows Name[en_GB]=Windows Name[fi]=Windows Name[it]=Windows