From c30a83a5b9de5b5c8b021e0921c5d8fb3aaba54d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 29 Jul 2016 09:28:55 +0000 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/helpers/org.kde.kpmcore.scan.actions | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/libparted/helpers/org.kde.kpmcore.scan.actions b/src/plugins/libparted/helpers/org.kde.kpmcore.scan.actions index 3c573cd..52252cc 100644 --- a/src/plugins/libparted/helpers/org.kde.kpmcore.scan.actions +++ b/src/plugins/libparted/helpers/org.kde.kpmcore.scan.actions @@ -57,6 +57,7 @@ Name[uk]=Дія із визначення типу файлової систем Name[x-test]=xxDetect file system type actionxx Description=Detect file system type Description[ca]=Detecta el tipus de sistema de fitxers +Description[de]=Dateisystemtyp erkennen Description[nl]=Type bestandssysteem detecteren Description[pt]=Detectar o tipo de sistema de ficheiros Description[sl]=Zaznaj vrsto datotečnega sistema