From b79988ff0ec02019579b29f41a883d040bddfc81 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 16 Jul 2021 01:18:11 +0000 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" --- .../plasma-packagestructure-layouttemplate.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell/packageplugins/layouttemplate/plasma-packagestructure-layouttemplate.desktop b/shell/packageplugins/layouttemplate/plasma-packagestructure-layouttemplate.desktop index dd41abce6..9ae6bf1d2 100644 --- a/shell/packageplugins/layouttemplate/plasma-packagestructure-layouttemplate.desktop +++ b/shell/packageplugins/layouttemplate/plasma-packagestructure-layouttemplate.desktop @@ -46,7 +46,7 @@ Name[sv]=Layoutmall Name[ta]=தளவமைப்பு வார்ப்புரு Name[tr]=Yerleşim Şablonu Name[uk]=Шаблон компонування -Name[vi]=Mẫu bố cục +Name[vi]=Bản mẫu bố cục Name[x-test]=xxLayout Templatexx Name[zh_CN]=布局模板 Name[zh_TW]=佈局樣本