From f89bc39c7665de5d2d1a7626ba321a6f62fa14f6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Mar 2018 05:21:27 +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/dummy/pmdummybackendplugin.json | 1 + src/plugins/libparted/pmlibpartedbackendplugin.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/plugins/dummy/pmdummybackendplugin.json b/src/plugins/dummy/pmdummybackendplugin.json index e778532..a0e709f 100644 --- a/src/plugins/dummy/pmdummybackendplugin.json +++ b/src/plugins/dummy/pmdummybackendplugin.json @@ -26,6 +26,7 @@ "Name[de]": "KDE-Partitionsverwaltung Dummy-Backend", "Name[fi]": "KDE:n osionhallinnan valetaustaosa", "Name[fr]": "Moteur de test pour le gestionnaire de partitions de KDE", + "Name[id]": "Backend Tiruan Pengelola Partisi KDE", "Name[it]": "Motore fittizio del gestore delle partizioni di KDE", "Name[nl]": "Dummy backend van KDE-partitiebeheerder", "Name[pt]": "Infra-Estrutura de Testes para o Gestor de Partições do KDE", diff --git a/src/plugins/libparted/pmlibpartedbackendplugin.json b/src/plugins/libparted/pmlibpartedbackendplugin.json index 769d7d5..e00c5e0 100644 --- a/src/plugins/libparted/pmlibpartedbackendplugin.json +++ b/src/plugins/libparted/pmlibpartedbackendplugin.json @@ -28,6 +28,7 @@ "Name[es]": "Motor LibParted para el gestor de particiones de KDE", "Name[fi]": "KDE:n osionhallinnan LibParted-taustaosa", "Name[fr]": "Moteur LibParted pour le gestionnaire de partitions de KDE", + "Name[id]": "Backend LibParted Pengelola Parisi KDE", "Name[it]": "Motore LibParted del gestore delle partizioni di KDE", "Name[nl]": "KDE-partitiebeheerder LibParted-backend", "Name[pt]": "Infra-Estrutura da LibParted para o Gestor de Partições do KDE",