From f40762a22031ce64507edc9a168a95218a69b859 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 27 Jul 2019 05:10:32 +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 | 3 +++ src/plugins/sfdisk/pmsfdiskbackendplugin.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/plugins/dummy/pmdummybackendplugin.json b/src/plugins/dummy/pmdummybackendplugin.json index df950d4..b894a13 100644 --- a/src/plugins/dummy/pmdummybackendplugin.json +++ b/src/plugins/dummy/pmdummybackendplugin.json @@ -21,6 +21,7 @@ "Name[ko]": "Volker Lanz", "Name[lt]": "Volker Lanz", "Name[nl]": "Volker Lanz", + "Name[nn]": "Volker Lanz", "Name[pl]": "Volker Lanz", "Name[pt]": "Volker Lanz", "Name[pt_BR]": "Volker Lanz", @@ -51,6 +52,7 @@ "Description[ko]": "테스트를 위한 KDE 파티션 관리자 더미 백엔드입니다.", "Description[lt]": "KDE skaidinių tvarkyklės netikra galinė sąsaja skirta testavimui.", "Description[nl]": "Dummy backend van KDE-partitiebeheerder voor testdoeleinden", + "Description[nn]": "Ein eksempelbakgrunnsmotor for KDE-partisjonshandtering, for testformål.", "Description[pl]": "Fikcyjny silnik zarządzania partycjami do prób.", "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í", @@ -81,6 +83,7 @@ "Name[lt]": "KDE skaidinių tvarkyklės netikra galinė sąsaja", "Name[nb]": "Attrapp-motor for KDE partisjonsbehandler", "Name[nl]": "Dummy backend van KDE-partitiebeheerder", + "Name[nn]": "KDE-partisjonshandtering eksempelbakgrunnsmotor", "Name[pl]": "Fikcyjny silnik zarządzania partycjami", "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/sfdisk/pmsfdiskbackendplugin.json b/src/plugins/sfdisk/pmsfdiskbackendplugin.json index b70aa73..47f82fb 100644 --- a/src/plugins/sfdisk/pmsfdiskbackendplugin.json +++ b/src/plugins/sfdisk/pmsfdiskbackendplugin.json @@ -21,6 +21,7 @@ "Name[ko]": "Andrius Štikonas", "Name[lt]": "Andrius Štikonas", "Name[nl]": "Andrius Štikonas", + "Name[nn]": "Andrius Štikonas", "Name[pl]": "Andrius Štikonas", "Name[pt]": "Andrius Štikonas", "Name[pt_BR]": "Andrius Štikonas", @@ -51,6 +52,7 @@ "Description[ko]": "KDE 파티션 관리자 sfdisk 백엔드입니다.", "Description[lt]": "KDE skaidinių tvarkyklės sfdisk galinė sąsaja.", "Description[nl]": "Een sfdisk backend van KDE-partitiebeheerder.", + "Description[nn]": "Ein sfdisk-bakgrunnsmotor for KDE-partisjonshandtering.", "Description[pl]": "Silnik sfdisk zarządzania partycjami.", "Description[pt]": "A infra-estrutura do 'sfdisk' para o Gestor de Partições do KDE.", "Description[sk]": "Backend KDE správcu partícií sfdisk.", @@ -79,6 +81,7 @@ "Name[ko]": "KDE 파티션 관리자 sfdisk 백엔드", "Name[lt]": "KDE skaidinių tvarkyklės sfdisk galinė sąsaja", "Name[nl]": "Sfdisk backend van KDE-partitiebeheerder", + "Name[nn]": "sfdisk-bakgrunnsmotor for KDE-partisjonshandtering", "Name[pl]": "Silnik sfdisk zarządzania partycjami", "Name[pt]": "Infra-Estrutura do Sfdisk para o Gestor de Partições do KDE", "Name[sk]": "Backend KDE správcu partícií sfdisk",