From 3776ad6a3c27347b850564adabb21e8dbe7037bb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 13 Aug 2019 05:29:58 +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" --- look-and-feel/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop index ea8bbae6..9a8d4219 100644 --- a/look-and-feel/metadata.desktop +++ b/look-and-feel/metadata.desktop @@ -23,6 +23,7 @@ Name[zh_TW]=Plasma 電話 Comment=Plasma workspace for smartphones Comment[ca]=Espai de treball del plasma per a telèfons intel·ligents Comment[ca@valencia]=Espai de treball del plasma per a telèfons intel·ligents +Comment[de]=Plasma-Arbeitsbereich für Smartphones Comment[en_GB]=Plasma workspace for smartphones Comment[es]=Espacio de trabajo de Plasma para teléfonos inteligentes Comment[fi]=Plasma-työtila älypuhelimiin @@ -43,6 +44,7 @@ Comment[zh_TW]=智慧型手機的 Plasma 工作空間 Keywords=Phone, Workspace, Look and Feel Keywords[ca]=Telèfon, Espai de treball, Aspecte i comportament Keywords[ca@valencia]=Telèfon, Espai de treball, Aspecte i comportament +Keywords[de]=Telefon, Handy, Smartphone, Arbeitsbereich, Erscheinungsbild Keywords[en_GB]=Phone, Workspace, Look and Feel Keywords[es]=Teléfono, espacio de trabajo, aspecto visual Keywords[fi]=Puhelin, työtila, ulkoasu ja tuntuma