From 42b236e8a935b3d5462e46ceda94b13caa2ff08d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 6 Apr 2019 05:55:45 +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/latte-indicators.knsrc | 1 + app/lattedock.notifyrc | 6 ++++++ 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 ++ 6 files changed, 12 insertions(+) diff --git a/app/latte-indicators.knsrc b/app/latte-indicators.knsrc index 5bada4c89..8907fe8bb 100644 --- a/app/latte-indicators.knsrc +++ b/app/latte-indicators.knsrc @@ -4,6 +4,7 @@ Name[ca]=Indicadors del Latte Name[ca@valencia]=Indicadors del Latte Name[en_GB]=Latte Indicators Name[gl]=Indicadores de Latte +Name[it]=Indicatori Latte Name[nl]=Indicatoren van Latte Name[pt]=Indicadores do Latte Name[sv]=Latte indikatorer diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index d091e4aba..ab484caa7 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -57,6 +57,7 @@ Name[ca]=S'ha importat amb èxit Name[ca@valencia]=S'ha importat amb èxit Name[en_GB]=Imported successfully Name[gl]=Importouse correctamente +Name[it]=Importata con successo Name[nl]=Met succes geïmporteerd Name[pt]=Importado com sucesso Name[sv]=Importerade med lyckat resultat @@ -70,6 +71,7 @@ Name[ca]=Ha fallat en importar Name[ca@valencia]=Ha fallat en importar Name[en_GB]=Failed to import Name[gl]=Non se puido importar +Name[it]=Impossibile importare Name[nl]=Importeren is mislukt Name[pt]=Não foi possível importar Name[sv]=Misslyckades importera @@ -83,6 +85,7 @@ Name[ca]=S'ha exportat amb èxit Name[ca@valencia]=S'ha exportat amb èxit Name[en_GB]=Exported successfully Name[gl]=Exportouse correctamente +Name[it]=Esportata correttamente Name[nl]=Met succes geëxporteerd Name[pt]=Exportada com sucesso Name[sv]=Exporterade med lyckat resultat @@ -96,6 +99,7 @@ Name[ca]=Ha fallat en exportar Name[ca@valencia]=Ha fallat en exportar Name[en_GB]=Failed to export Name[gl]=Non se puido exportar +Name[it]=Impossibile esportare Name[nl]=Exporteren is mislukt Name[pt]=Não foi possível exportar Name[sv]=Misslyckades exportera @@ -108,6 +112,7 @@ Name=Removed successfully Name[ca]=S'ha eliminat amb èxit Name[ca@valencia]=S'ha eliminat amb èxit Name[gl]=Retirouse correctamente +Name[it]=Rimossa con successo Name[nl]=Met succes verwijderd Name[pt]=Removido com sucesso Name[uk]=Успішно вилучено @@ -119,6 +124,7 @@ Name=Failed to remove Name[ca]=Ha fallat en eliminar Name[ca@valencia]=Ha fallat en eliminar Name[gl]=Non se puido retirar +Name[it]=Impossibile rimuovere Name[nl]=Verwijderen is mislukt Name[pt]=Não foi possível remover Name[uk]=Не вдалося вилучити diff --git a/app/packageplugins/indicator/latte-indicator.desktop b/app/packageplugins/indicator/latte-indicator.desktop index e62a24541..3398aa12f 100644 --- a/app/packageplugins/indicator/latte-indicator.desktop +++ b/app/packageplugins/indicator/latte-indicator.desktop @@ -7,6 +7,7 @@ Comment[ca]=Indicador del Latte Comment[ca@valencia]=Indicador del Latte Comment[en_GB]=Latte indicator Comment[gl]=Indicador de Latte +Comment[it]=Indicatore Latte Comment[nl]=Indicator van Latte Comment[pt]=Indicador do Latte Comment[sv]=Latte indikator diff --git a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop index 779740bb4..5714dac35 100644 --- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop +++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop @@ -4,6 +4,7 @@ Name[ca]=Indicador Name[ca@valencia]=Indicador Name[en_GB]=Indicator Name[gl]=Indicador +Name[it]=Indicatore Name[nl]=Indicator Name[pt]=Indicador Name[sv]=Indikator diff --git a/indicators/default/metadata.desktop b/indicators/default/metadata.desktop index 01dd78869..5ba32c633 100644 --- a/indicators/default/metadata.desktop +++ b/indicators/default/metadata.desktop @@ -28,6 +28,7 @@ Comment[ca]=Indicador predeterminat del Latte Comment[ca@valencia]=Indicador predeterminat del Latte Comment[en_GB]=Latte default indicator 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[sv]=Latte standardindikator diff --git a/indicators/org.kde.latte.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop index 144e7b366..01ba1aade 100644 --- a/indicators/org.kde.latte.plasma/metadata.desktop +++ b/indicators/org.kde.latte.plasma/metadata.desktop @@ -5,6 +5,7 @@ Name[ca@valencia]=Plasma Name[en_GB]=Plasma Name[fr]=Plasma Name[gl]=Plasma +Name[it]=Plasma Name[nl]=Plasma Name[pt]=Plasma Name[sv]=Plasma @@ -15,6 +16,7 @@ Comment[ca]=Indicador a l'estil Plasma del Latte Comment[ca@valencia]=Indicador a l'estil Plasma del Latte Comment[en_GB]=Latte Plasma style indicator 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[sv]=Latte Plasmastilindikator