From dacf4d71a8c7814561bbffeb8f8f56dd28f1a50c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 21 Oct 2021 01:16:23 +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.plasma/metadata.desktop | 2 +- indicators/org.kde.latte.plasmatabstyle/metadata.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indicators/org.kde.latte.plasma/metadata.desktop b/indicators/org.kde.latte.plasma/metadata.desktop index 6f04b4516..28bb264ad 100644 --- a/indicators/org.kde.latte.plasma/metadata.desktop +++ b/indicators/org.kde.latte.plasma/metadata.desktop @@ -61,7 +61,7 @@ Comment[sl]=Kazalnik sloga Latte Plasma Comment[sv]=Latte Plasmastilindikator Comment[uk]=Індикатор стилю Плазми Латте Comment[x-test]=xxLatte Plasma style indicatorxx -Comment[zh_CN]=Latte Plasma 样式指示器 +Comment[zh_CN]=Latte Plasma 风格指示器 Comment[zh_TW]=Latte Plasma 樣式指示器 Encoding=UTF-8 diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop index b306401ed..f702925df 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.desktop +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.desktop @@ -24,7 +24,7 @@ Name[sl]=Slog Plasma zavihkov Name[sv]=Plasma flikstil Name[uk]=Стиль вкладок Плазми Name[x-test]=xxPlasma Tab Stylexx -Name[zh_CN]=Plasma 标签样式 +Name[zh_CN]=Plasma 标签页风格 Name[zh_TW]=Plasma 分頁樣式 Comment=Plasma Tab style indicator for Latte Comment[az]=Latte üçün Plasma Vərəq Üslubu indikatoru