From 09147cdead93bb7112ee6df7ffa0b654fa09f3fd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 16 Apr 2019 05:55:44 +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" --- app/lattedock.notifyrc | 1 - app/packageplugins/indicator/latte-indicator.desktop | 1 + .../indicator/latte-packagestructure-indicator.desktop | 1 + indicators/default/metadata.desktop | 1 + indicators/org.kde.latte.plasma/metadata.desktop | 2 ++ 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index 0b1280df1..f4df1f375 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -42,7 +42,6 @@ Comment[nl]=Latte Dock Comment[nn]=Latte-dokk Comment[pl]=Dok Latte Comment[pt]=Área Acoplável do Latte -Comment[pt_BR]=Latte Dock Comment[ru]=Latte Dock Comment[sv]=Latte dockningsfönster Comment[uk]=Панель Латте diff --git a/app/packageplugins/indicator/latte-indicator.desktop b/app/packageplugins/indicator/latte-indicator.desktop index 29a204a57..2045e7a46 100644 --- a/app/packageplugins/indicator/latte-indicator.desktop +++ b/app/packageplugins/indicator/latte-indicator.desktop @@ -11,6 +11,7 @@ Comment[gl]=Indicador de Latte Comment[it]=Indicatore Latte Comment[nl]=Indicator van Latte Comment[pt]=Indicador do Latte +Comment[pt_BR]=Indicador do Latte Comment[sv]=Latte indikator Comment[uk]=Індикатор Латте Comment[x-test]=xxLatte indicatorxx diff --git a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop index fe31e25c3..5b555d612 100644 --- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop +++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop @@ -8,6 +8,7 @@ Name[gl]=Indicador Name[it]=Indicatore Name[nl]=Indicator Name[pt]=Indicador +Name[pt_BR]=Indicador Name[sv]=Indikator Name[uk]=Індикатор Name[x-test]=xxIndicatorxx diff --git a/indicators/default/metadata.desktop b/indicators/default/metadata.desktop index 10610825d..596926bdc 100644 --- a/indicators/default/metadata.desktop +++ b/indicators/default/metadata.desktop @@ -32,6 +32,7 @@ Comment[gl]=Indicador predeterminado de Latte Comment[it]=Indicatore predefinito di Latte Comment[nl]=Standaard indicator van Latte Comment[pt]=Indicador predefinido do Latte +Comment[pt_BR]=Indicador padrão do Latte Comment[sv]=Latte standardindikator Comment[uk]=Типовий індикатор Латте Comment[x-test]=xxLatte default indicatorxx diff --git a/indicators/org.kde.latte.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop index 496ae9075..8c852591e 100644 --- a/indicators/org.kde.latte.plasma/metadata.desktop +++ b/indicators/org.kde.latte.plasma/metadata.desktop @@ -11,6 +11,7 @@ Name[it]=Plasma Name[nl]=Plasma Name[nn]=Plasma Name[pt]=Plasma +Name[pt_BR]=Plasma Name[sv]=Plasma Name[uk]=Плазма Name[x-test]=xxPlasmaxx @@ -23,6 +24,7 @@ Comment[gl]=Indicador de estilo Plasma de Latte Comment[it]=Indicatore stile di Plasma di Latte Comment[nl]=Plasma stijlindicator van Latte Comment[pt]=Indicador de estilo do Plasma no Latte +Comment[pt_BR]=Indicador de estilo do Plasma no Latte Comment[sv]=Latte Plasmastilindikator Comment[uk]=Індикатор стилю Плазми Латте Comment[x-test]=xxLatte Plasma style indicatorxx