From 71d375d0d9d0ca5b23c10ab7c948ee11f6d8a930 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Jul 2019 05:24:06 +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 8bfd8800..d415d2a7 100644 --- a/shell/metadata.desktop +++ b/shell/metadata.desktop @@ -26,6 +26,7 @@ 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[fr]=Terminal Plasma pour smartphones Comment[gl]=Intérprete de ordes de Plasma para móbiles Comment[it]=Shell di Plasma per telefoni Comment[ko]=휴대폰용 Plasma 셸