From 2f621fc6db34c48bcb7d0f44fc2dcae0caf0d2c2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 13 Mar 2018 05:16:54 +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 | 2 ++ src/plugins/libparted/pmlibpartedbackendplugin.json | 2 ++ src/plugins/sfdisk/pmsfdiskbackendplugin.json | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/plugins/dummy/pmdummybackendplugin.json b/src/plugins/dummy/pmdummybackendplugin.json index 324cb5f..c230985 100644 --- a/src/plugins/dummy/pmdummybackendplugin.json +++ b/src/plugins/dummy/pmdummybackendplugin.json @@ -9,6 +9,7 @@ ], "Category": "BackendPlugin", "Description": "A KDE Partition Manager dummy backend for testing purposes.", + "Description[ca@valencia]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.", "Description[ca]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.", "Description[de]": "Ein Dummy-Backend für die KDE-Partitionsverwaltung zu Testzwecken.", "Description[nl]": "Dummy backend van KDE-partitiebeheerder voor testdoeleinden", @@ -22,6 +23,7 @@ "Id": "pmdummybackendplugin", "License": "GPL", "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[de]": "KDE-Partitionsverwaltung Dummy-Backend", "Name[fi]": "KDE:n osionhallinnan valetaustaosa", diff --git a/src/plugins/libparted/pmlibpartedbackendplugin.json b/src/plugins/libparted/pmlibpartedbackendplugin.json index 38c4565..2593eef 100644 --- a/src/plugins/libparted/pmlibpartedbackendplugin.json +++ b/src/plugins/libparted/pmlibpartedbackendplugin.json @@ -9,6 +9,7 @@ ], "Category": "BackendPlugin", "Description": "The LibParted backend for KDE Partition Manager", + "Description[ca@valencia]": "Un dorsal pel LibParted del gestor de particions del KDE", "Description[ca]": "Un dorsal pel LibParted del gestor de particions del KDE", "Description[de]": "Das LibParted-Backend für die KDE-Partitionsverwaltung", "Description[es]": "El motor LibParted para el gestor de particiones de KDE", @@ -23,6 +24,7 @@ "Id": "pmlibpartedbackendplugin", "License": "GPL", "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[de]": "KDE-Partitionsverwaltung LibParted-Backend", "Name[es]": "Motor LibParted para el gestor de particiones de KDE", diff --git a/src/plugins/sfdisk/pmsfdiskbackendplugin.json b/src/plugins/sfdisk/pmsfdiskbackendplugin.json index 890fd27..94274dd 100644 --- a/src/plugins/sfdisk/pmsfdiskbackendplugin.json +++ b/src/plugins/sfdisk/pmsfdiskbackendplugin.json @@ -9,6 +9,7 @@ ], "Category": "BackendPlugin", "Description": "A KDE Partition Manager sfdisk backend.", + "Description[ca@valencia]": "Un dorsal «sfdisk» del gestor de particions del KDE.", "Description[ca]": "Un dorsal «sfdisk» del gestor de particions del KDE.", "Description[de]": "Ein sfdisk-Backend für die KDE-Partitionsverwaltung.", "Description[es]": "Motor sfdisk para el gestor de particiones de KDE.", @@ -23,6 +24,7 @@ "Id": "pmsfdiskbackendplugin", "License": "GPL", "Name": "KDE Partition Manager sfdisk Backend", + "Name[ca@valencia]": "Dorsal «sfdisk» del gestor de particions del KDE", "Name[ca]": "Dorsal «sfdisk» del gestor de particions del KDE", "Name[de]": "KDE-Partitionsverwaltung sfdisk-Backend", "Name[es]": "Motor sfdisk para el gestor de particiones de KDE",