From b3890dd1bdee58039e53215437b796202504e7ac Mon Sep 17 00:00:00 2001 From: aooom Date: Mon, 9 Apr 2018 15:17:41 +0800 Subject: [PATCH] translate --- .../lean/default-settings/i18n/default.zh-cn.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/package/lean/default-settings/i18n/default.zh-cn.po b/package/lean/default-settings/i18n/default.zh-cn.po index c5167e294..bf5517236 100644 --- a/package/lean/default-settings/i18n/default.zh-cn.po +++ b/package/lean/default-settings/i18n/default.zh-cn.po @@ -7,17 +7,11 @@ msgstr "架构" msgid "CPU Temperature" msgstr "CPU温度" -<<<<<<< HEAD +msgid "CPU Info" +msgstr "CPU信息" + msgid "CPU Model" msgstr "处理器型号" -======= -msgid "CPU Info" -msgstr "CPU信息" - ->>>>>>> upstream/master - -msgid "CPU Info" -msgstr "CPU信息" msgid "CPU frequency" msgstr "CPU频率" @@ -26,13 +20,13 @@ msgid "RAM frequency" msgstr "RAM频率" msgid "Flash Size" -msgstr "闪存" +msgstr "闪存大小" msgid "Free Memory" msgstr "释放内存" msgid "ShadowsocksR Pro" -msgstr "虾都缩壳" +msgstr "酸酸乳" msgid "Core" msgstr "核心数"