From 84babf39d198df9711a551716988941de21c9cc7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 19 May 2022 01:43:05 +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" --- look-and-feel/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop index b3da73a3..5a8bd595 100644 --- a/look-and-feel/metadata.desktop +++ b/look-and-feel/metadata.desktop @@ -45,7 +45,7 @@ Comment=Plasma workspace for smartphones Comment[ast]=La estaya de trabayu de Plasma pa teléfonos intelixentes Comment[az]=Smartfonlar üçün Plasma iş sahəsi Comment[ca]=Espai de treball del Plasma per a telèfons intel·ligents -Comment[ca@valencia]=Espai de treball de Plasma per a telèfons intel·ligents +Comment[ca@valencia]=Espai de treball Plasma per a telèfons intel·ligents Comment[da]=Plasma arbejdsområde til smartphones Comment[de]=Plasma-Arbeitsbereich für Smartphones Comment[en_GB]=Plasma workspace for smartphones