From 4406297053f3e940352f1aac44b5c2df76a0bdf0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 12 Mar 2018 04:59:29 +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 a0e709f..324cb5f 100644 --- a/src/plugins/dummy/pmdummybackendplugin.json +++ b/src/plugins/dummy/pmdummybackendplugin.json @@ -28,6 +28,7 @@ "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[nb]": "Attrapp-motor for KDE partisjonsbehandler", "Name[nl]": "Dummy backend van KDE-partitiebeheerder", "Name[pt]": "Infra-Estrutura de Testes para o Gestor de Partições do KDE", "Name[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 e00c5e0..38c4565 100644 --- a/src/plugins/libparted/pmlibpartedbackendplugin.json +++ b/src/plugins/libparted/pmlibpartedbackendplugin.json @@ -30,6 +30,7 @@ "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[nb]": "KDE partisjonsbehandler, bakgrunnsmotor for libparted", "Name[nl]": "KDE-partitiebeheerder LibParted-backend", "Name[pt]": "Infra-Estrutura da LibParted para o Gestor de Partições do KDE", "Name[sk]": "LibParted - program v pozadí pre KDE Správcu partícií",