From af8c4c939266d13be50fc31af4841cb53b788315 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 21 May 2019 06:10:44 +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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/metadata.desktop b/shell/metadata.desktop index c14623ee..cb703cb4 100644 --- a/shell/metadata.desktop +++ b/shell/metadata.desktop @@ -26,12 +26,14 @@ 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[it]=Shell di Plasma per telefoni Comment[ko]=휴대폰용 Plasma 셸 Comment[nl]=Plasma-shell voor telefoons Comment[pt]=Área de trabalho Plasma para telemóveis Comment[sv]=Plasma skal för telefoner Comment[uk]=Оболонка Плазми для телефонів Comment[x-test]=xxPlasma shell for phonesxx +Comment[zh_TW]=適用於手機的 Plasma Shell Type=Service X-KDE-ServiceTypes=Plasma/Shell