From a34edfa861b5787c1748bd3e40dccf75b5b81ef9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 1 Aug 2019 05:00:13 +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 51b2bce8..59aa7f10 100644 --- a/shell/metadata.desktop +++ b/shell/metadata.desktop @@ -25,6 +25,7 @@ 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[cs]=Plasma Shell pro telefony 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