From c63567b524a9dc4b97b247d67203a2888dec9ffb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 15 Dec 2016 06:24:36 +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/libparted/pmlibpartedbackendplugin.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/libparted/pmlibpartedbackendplugin.desktop b/src/plugins/libparted/pmlibpartedbackendplugin.desktop index b2d2619..1affccd 100644 --- a/src/plugins/libparted/pmlibpartedbackendplugin.desktop +++ b/src/plugins/libparted/pmlibpartedbackendplugin.desktop @@ -2,6 +2,7 @@ Encoding=UTF-8 Name=KDE Partition Manager LibParted Backend Name[ar]=سند LibParted لمدير كدي للأقسام +Name[ast]=Backend LibParted del xestor de ficheros de KDE Name[bg]=Ядро LibParted за управление на дялове в KDE Name[bs]=LibParted pozadina za KDE‑ov menadžer particija Name[ca]=Dorsal pel LibParted del gestor de particions del KDE