From 7497d509f4b4ba1ae252ae4760a91d4743bbf98b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 7 Jun 2018 05:41:48 +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" --- src/plugins/dummy/pmdummybackendplugin.json | 1 + src/plugins/libparted/pmlibpartedbackendplugin.json | 1 + src/plugins/sfdisk/pmsfdiskbackendplugin.json | 1 + 3 files changed, 3 insertions(+) diff --git a/src/plugins/dummy/pmdummybackendplugin.json b/src/plugins/dummy/pmdummybackendplugin.json index 4169c9d..055d483 100644 --- a/src/plugins/dummy/pmdummybackendplugin.json +++ b/src/plugins/dummy/pmdummybackendplugin.json @@ -14,6 +14,7 @@ "Description[de]": "Ein Dummy-Backend für die KDE-Partitionsverwaltung zu Testzwecken.", "Description[es]": "Un motor de simulación para el gestor de particiones de KDE para hacer pruebas.", "Description[gl]": "Unha infraestrutura de probas para o xestor de particións de KDE.", + "Description[it]": "Un motore fittizio del gestore delle partizioni di KDE per scopi di prova.", "Description[nl]": "Dummy backend van KDE-partitiebeheerder voor testdoeleinden", "Description[pt]": "Uma infra-estrutura de testes para o Gestor de Partições do KDE.", "Description[sk]": "Testovací program v pozadí KDE Správcu partícií", diff --git a/src/plugins/libparted/pmlibpartedbackendplugin.json b/src/plugins/libparted/pmlibpartedbackendplugin.json index 7687f7c..ef69663 100644 --- a/src/plugins/libparted/pmlibpartedbackendplugin.json +++ b/src/plugins/libparted/pmlibpartedbackendplugin.json @@ -14,6 +14,7 @@ "Description[de]": "Das LibParted-Backend für die KDE-Partitionsverwaltung", "Description[es]": "El motor LibParted para el gestor de particiones de KDE", "Description[gl]": "A infraestrutura de LibPartes para o xestor de particións de KDE.", + "Description[it]": "Il motore LibParted del gestore delle partizioni di KDE", "Description[nl]": "De LibParted-backend voor de KDE-partitiebeheerder", "Description[pt]": "A infra-estrutura da LibParted para o Gestor de Partições do KDE", "Description[sk]": "LibParted - program v pozadí pre KDE Správcu partícií", diff --git a/src/plugins/sfdisk/pmsfdiskbackendplugin.json b/src/plugins/sfdisk/pmsfdiskbackendplugin.json index 66e3d0a..e2009db 100644 --- a/src/plugins/sfdisk/pmsfdiskbackendplugin.json +++ b/src/plugins/sfdisk/pmsfdiskbackendplugin.json @@ -14,6 +14,7 @@ "Description[de]": "Ein sfdisk-Backend für die KDE-Partitionsverwaltung.", "Description[es]": "Motor sfdisk para el gestor de particiones de KDE.", "Description[gl]": "Unha infraestrutura de sfdisk para o xestor de particións de KDE.", + "Description[it]": "Un motore sfdisk del gestore delle partizioni di KDE.", "Description[nl]": "Een sfdisk backend van KDE-partitiebeheerder.", "Description[pt]": "A infra-estrutura do 'sfdisk' para o Gestor de Partições do KDE.", "Description[sk]": "Backend KDE správcu partícií sfdisk.",