From cec97e231b6106eb5c69fd9b774769cd3c8e72b1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 5 May 2019 06:05:26 +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" --- shell/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/shell/metadata.desktop b/shell/metadata.desktop index af92b8fa..38cc8a15 100644 --- a/shell/metadata.desktop +++ b/shell/metadata.desktop @@ -23,6 +23,7 @@ Name[zh_CN]=手机 Name[zh_TW]=電話 Comment=Plasma shell for phones Comment[ca]=Espai de treball Plasma per a telèfons +Comment[ca@valencia]=Espai de treball Plasma per a telèfons Comment[es]=Interfaz de Plasma para teléfonos Comment[nl]=Plasma-shell voor telefoons Comment[pt]=Área de trabalho Plasma para telemóveis