From 8658743a49532182d522eed809fbc064414bbc96 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 30 Mar 2018 05:19:57 +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 + 2 files changed, 2 insertions(+) diff --git a/src/plugins/dummy/pmdummybackendplugin.json b/src/plugins/dummy/pmdummybackendplugin.json index ed23869..5bb0fb6 100644 --- a/src/plugins/dummy/pmdummybackendplugin.json +++ b/src/plugins/dummy/pmdummybackendplugin.json @@ -26,6 +26,7 @@ "Name": "KDE Partition Manager Dummy Backend", "Name[ca@valencia]": "Dorsal fals del gestor de particions del KDE", "Name[ca]": "Dorsal fals del gestor de particions del KDE", + "Name[cs]": "Podpůrná vrstva pro správce diskových oddílů pro KDE", "Name[de]": "KDE-Partitionsverwaltung Dummy-Backend", "Name[es]": "Motor de simulación para el gestor de particiones de KDE", "Name[fi]": "KDE:n osionhallinnan valetaustaosa", diff --git a/src/plugins/libparted/pmlibpartedbackendplugin.json b/src/plugins/libparted/pmlibpartedbackendplugin.json index 2593eef..38526f3 100644 --- a/src/plugins/libparted/pmlibpartedbackendplugin.json +++ b/src/plugins/libparted/pmlibpartedbackendplugin.json @@ -26,6 +26,7 @@ "Name": "KDE Partition Manager LibParted Backend", "Name[ca@valencia]": "Dorsal pel LibParted del gestor de particions del KDE", "Name[ca]": "Dorsal pel LibParted del gestor de particions del KDE", + "Name[cs]": "Podpůrná vrstva LibParted pro správce diskových oddílů pro KDE", "Name[de]": "KDE-Partitionsverwaltung LibParted-Backend", "Name[es]": "Motor LibParted para el gestor de particiones de KDE", "Name[fi]": "KDE:n osionhallinnan LibParted-taustaosa",