From e119477dd3ee8a9441d02107d249084da407cd80 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 Dec 2023 03:47:40 +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" --- indicators/org.kde.latte.plasmatabstyle/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop index 38c4f52d5..473e488b9 100644 --- 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