From d9217065fe2ffdf86e9ecfd766e290433753aef9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Apr 2019 05:46: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 8907fe8bb..56fb11d7b 100644 --- a/app/latte-indicators.knsrc +++ b/app/latte-indicators.knsrc @@ -3,6 +3,7 @@ Name=Latte Indicators Name[ca]=Indicadors del Latte Name[ca@valencia]=Indicadors del Latte Name[en_GB]=Latte Indicators +Name[es]=Indicadores de Latte Name[gl]=Indicadores de Latte Name[it]=Indicatori Latte Name[nl]=Indicatoren van Latte diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index 166f0ed69..54e24c74e 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -56,6 +56,7 @@ Name=Imported successfully Name[ca]=S'ha importat amb èxit Name[ca@valencia]=S'ha importat amb èxit Name[en_GB]=Imported successfully +Name[es]=Importada exitosamente Name[gl]=Importouse correctamente Name[it]=Importata con successo Name[nl]=Met succes geïmporteerd @@ -70,6 +71,7 @@ Name=Failed to import Name[ca]=Ha fallat en importar Name[ca@valencia]=Ha fallat en importar Name[en_GB]=Failed to import +Name[es]=Error al importar Name[gl]=Non se puido importar Name[it]=Impossibile importare Name[nl]=Importeren is mislukt @@ -84,6 +86,7 @@ Name=Exported successfully Name[ca]=S'ha exportat amb èxit Name[ca@valencia]=S'ha exportat amb èxit Name[en_GB]=Exported successfully +Name[es]=Exportada exitosamente Name[gl]=Exportouse correctamente Name[it]=Esportata correttamente Name[nl]=Met succes geëxporteerd @@ -98,6 +101,7 @@ Name=Failed to export Name[ca]=Ha fallat en exportar Name[ca@valencia]=Ha fallat en exportar Name[en_GB]=Failed to export +Name[es]=Error al exportar Name[gl]=Non se puido exportar Name[it]=Impossibile esportare Name[nl]=Exporteren is mislukt @@ -112,6 +116,7 @@ Name=Removed successfully Name[ca]=S'ha eliminat amb èxit Name[ca@valencia]=S'ha eliminat amb èxit Name[en_GB]=Removed successfully +Name[es]=Eliminada exitosamente Name[gl]=Retirouse correctamente Name[it]=Rimossa con successo Name[nl]=Met succes verwijderd @@ -125,6 +130,7 @@ Name=Failed to remove Name[ca]=Ha fallat en eliminar Name[ca@valencia]=Ha fallat en eliminar Name[en_GB]=Failed to remove +Name[es]=Error al eliminar Name[gl]=Non se puido retirar Name[it]=Impossibile rimuovere Name[nl]=Verwijderen is mislukt diff --git a/app/packageplugins/indicator/latte-indicator.desktop b/app/packageplugins/indicator/latte-indicator.desktop index 3398aa12f..29a204a57 100644 --- a/app/packageplugins/indicator/latte-indicator.desktop +++ b/app/packageplugins/indicator/latte-indicator.desktop @@ -6,6 +6,7 @@ Comment=Latte indicator Comment[ca]=Indicador del Latte Comment[ca@valencia]=Indicador del Latte Comment[en_GB]=Latte indicator +Comment[es]=Indicador Latte Comment[gl]=Indicador de Latte Comment[it]=Indicatore Latte Comment[nl]=Indicator van Latte diff --git a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop index 5714dac35..fe31e25c3 100644 --- a/app/packageplugins/indicator/latte-packagestructure-indicator.desktop +++ b/app/packageplugins/indicator/latte-packagestructure-indicator.desktop @@ -3,6 +3,7 @@ Name=Indicator Name[ca]=Indicador Name[ca@valencia]=Indicador Name[en_GB]=Indicator +Name[es]=Indicador Name[gl]=Indicador Name[it]=Indicatore Name[nl]=Indicator diff --git a/indicators/default/metadata.desktop b/indicators/default/metadata.desktop index 5ba32c633..10610825d 100644 --- a/indicators/default/metadata.desktop +++ b/indicators/default/metadata.desktop @@ -27,6 +27,7 @@ Comment=Latte default indicator Comment[ca]=Indicador predeterminat del Latte Comment[ca@valencia]=Indicador predeterminat del Latte Comment[en_GB]=Latte default indicator +Comment[es]=Indicador por omisión de Latte Comment[gl]=Indicador predeterminado de Latte Comment[it]=Indicatore predefinito di Latte Comment[nl]=Standaard indicator van Latte diff --git a/indicators/org.kde.latte.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop index 01ba1aade..fd47bb1f4 100644 --- a/indicators/org.kde.latte.plasma/metadata.desktop +++ b/indicators/org.kde.latte.plasma/metadata.desktop @@ -3,6 +3,7 @@ Name=Plasma Name[ca]=Plasma Name[ca@valencia]=Plasma Name[en_GB]=Plasma +Name[es]=Plasma Name[fr]=Plasma Name[gl]=Plasma Name[it]=Plasma @@ -15,6 +16,7 @@ Comment=Latte Plasma style indicator 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[es]=Estilo del indicador Plasma Latte Comment[gl]=Indicador de estilo Plasma de Latte Comment[it]=Indicatore stile di Plasma di Latte Comment[nl]=Plasma stijlindicator van Latte