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"
1 year ago · e119477dd3
parent a9f8f2ace3
commit e119477dd3
1 changed files with 1 additions and 1 deletions
--- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
+++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop
@ -55,7 +55,7 @@ Comment[sl]=Kazalnik Latte sloga Plasma zavihkov
 Comment[sv]=Plasma flikstilsindikator för Latte
 Comment[uk]=Індикатор стилю вкладок Плазми для Латте
 Comment[x-test]=xxPlasma Tab style indicator for Lattexx
-Comment[zh_CN]=Latte 的 Plasma 标签风格指示器
+Comment[zh_CN]=Latte 的 Plasma 标签页风格指示器
 Comment[zh_TW]=適用於 Latte 的 Plasma 分頁樣式指示器

 Encoding=UTF-8