From ec8e5139e68ce5b5d9f900b6ec0004eae37e848b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 15 May 2024 01:18: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" --- quicksettings/nightcolor/package/metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quicksettings/nightcolor/package/metadata.json b/quicksettings/nightcolor/package/metadata.json index 372424d0..6a1a8823 100644 --- a/quicksettings/nightcolor/package/metadata.json +++ b/quicksettings/nightcolor/package/metadata.json @@ -73,7 +73,7 @@ "Description[tr]": "Plasma Cep gece rengi tez ayarı", "Description[uk]": "Швидке налаштовування нічних кольорів для Мобільної Плазми", "Description[x-test]": "xxNight color quick setting for Plasma Mobilexx", - "Description[zh_CN]": "Plasma Mobile 的夜间颜色快捷设置", + "Description[zh_CN]": "Plasma Mobile 的夜间色温快捷设置", "Description[zh_TW]": "Plasma 行動的夜色模式快速設定", "Icon": "redshift-status-on", "Id": "org.kde.plasma.quicksetting.nightcolor", @@ -117,7 +117,7 @@ "Name[tr]": "Gece Rengi", "Name[uk]": "Нічні кольори", "Name[x-test]": "xxNight Colorxx", - "Name[zh_CN]": "夜间颜色", + "Name[zh_CN]": "夜间色温", "Name[zh_TW]": "夜色", "Website": "https://kde.org" }