chore: 同步tablet分支代码
This commit is contained in:
zhoubin
parent
7f4b5ea7c6
commit
4d82755628
|
|
@ -1,3 +1,12 @@
|
|||
ukui-control-center (3.22.1.25-ok20) v101; urgency=medium
|
||||
|
||||
* 【控制面板】英文系统，控制面板的键盘界面标题keyboard中间存在空格
|
||||
* 需求：无
|
||||
* 任务：重新编译代码
|
||||
* 其他改动：无
|
||||
|
||||
-- zhoubin <zhoubin@kylinos.cn> Wed, 24 May 2023 10:25:18 +0800
|
||||
|
||||
ukui-control-center (3.22.1.25-ok19) yangtze; urgency=medium
|
||||
|
||||
* bug#I72LR7 小时制且日期时间格式为藏文，登录界面的时间显示为英文
|
||||
|
|
|
|||
|
|
@ -120,7 +120,6 @@ void ChangeUserLogo::initUI()
|
|||
culLogoLabel = new QLabel;
|
||||
culLogoLabel->setFixedSize(QSize(48, 48));
|
||||
culNickNameLabel = new QLabel;
|
||||
culNickNameLabel->setFixedHeight(24);
|
||||
culTypeLabel = new QLabel;
|
||||
culTypeLabel->setFixedHeight(24);
|
||||
|
||||
|
|
|
|||
|
|
@ -1182,7 +1182,7 @@ void Widget::outputAdded(const KScreen::OutputPtr &output, bool connectChanged)
|
|||
}
|
||||
|
||||
// bug#170141
|
||||
if (output->type() == 14 && Utils::getCpuInfo() == "ZHAOXIN KaiXian KX-6640MA@2.2+GHz"&& Utils::outputName(output) == "DisplayPort-0" && mMachineType == "all in one") {
|
||||
if (output->type() == 14 && UkccCommon::getCpuInfo() == "ZHAOXIN KaiXian KX-6640MA@2.2+GHz"&& Utils::outputName(output) == "DisplayPort-0" && mMachineType == "all in one") {
|
||||
firstAddOutputName = Utils::outputName(output);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3109,11 +3109,6 @@ change system settings</source>
|
|||
</context>
|
||||
<context>
|
||||
<name>KeyboardUi</name>
|
||||
<message>
|
||||
<source>Key board settings</source>
|
||||
<translation type="vanished">གཙོ་གནད་པང་ལེབ་ཀྱི་སྒྲག་བཀོད།</translation>
|
||||
<extra-contents_path>/Keyboard/Key board settings</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="22"/>
|
||||
<source>Keyboard Settings</source>
|
||||
|
|
@ -4712,11 +4707,6 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
|
|||
<source>Lock screen delay</source>
|
||||
<translation type="vanished">བརྙན་ཤེལ་གྱི་དུས་ཚོད་འགོར་འགྱངས</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Browse</source>
|
||||
<translation type="vanished">ལྟ་ཀློག་བྱེད་པ།</translation>
|
||||
<extra-contents_path>/Screenlock/Browse</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<source>Online Picture</source>
|
||||
<translation type="vanished">དྲ་ཐོག་པར་རིས།</translation>
|
||||
|
|
@ -4768,11 +4758,6 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
|
|||
<translation type="vanished">ས་གནས་ཀྱི་རི་མོ།</translation>
|
||||
<extra-contents_path>/Screenlock/Local Pictures</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<source>Online Pictures</source>
|
||||
<translation type="vanished">དྲ་ཐོག་པར་རིས།</translation>
|
||||
<extra-contents_path>/Screenlock/Online Pictures</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../plugins/personalized/screenlock/screenlock.cpp" line="210"/>
|
||||
<source>select custom wallpaper file</source>
|
||||
|
|
@ -6217,11 +6202,6 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
|
|||
<translation type="vanished">ལྟ་ཀློག་བྱེད་པ།</translation>
|
||||
<extra-contents_path>/Wallpaper/Browse</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<source>Online Picture</source>
|
||||
<translation type="vanished">དྲ་ཐོག་པར་རིས།</translation>
|
||||
<extra-contents_path>/Wallpaper/Online Picture</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../plugins/personalized/wallpaper/wallpaper.cpp" line="243"/>
|
||||
<source>Cancel</source>
|
||||
|
|
@ -6237,11 +6217,6 @@ II.Javaལག་རྩལ་གྱི་ཚད་བཀག
|
|||
<translation type="vanished">ས་གནས་ཀྱི་རི་མོ།</translation>
|
||||
<extra-contents_path>/Wallpaper/Local Pictures</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<source>Online Pictures</source>
|
||||
<translation type="vanished">དྲ་ཐོག་པར་རིས།</translation>
|
||||
<extra-contents_path>/Wallpaper/Online Pictures</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../plugins/personalized/wallpaper/wallpaper.cpp" line="124"/>
|
||||
<location filename="../../../plugins/personalized/wallpaper/wallpaper.cpp" line="143"/>
|
||||
|
|
|
|||
|
|
@ -5887,11 +5887,6 @@ folder will be deleted!</source>
|
|||
</context>
|
||||
<context>
|
||||
<name>KeyboardUi</name>
|
||||
<message>
|
||||
<source>Key board settings</source>
|
||||
<translation type="vanished">键盘设置</translation>
|
||||
<extra-contents_path>/Keyboard/Key board settings</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../plugins/devices/keyboard/keyboardui.cpp" line="22"/>
|
||||
<source>Keyboard Settings</source>
|
||||
|
|
@ -10059,16 +10054,6 @@ E-mail: support@kylinos.cn</source>
|
|||
<source>Show message on lock screen</source>
|
||||
<translation type="vanished">锁屏时显示消息</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Browse</source>
|
||||
<translation type="vanished">浏览</translation>
|
||||
<extra-contents_path>/Screenlock/Browse</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<source>Online Picture</source>
|
||||
<translation type="vanished">线上图片</translation>
|
||||
<extra-contents_path>/Screenlock/Online Picture</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<source>Related Settings</source>
|
||||
<translation type="vanished">相关设置</translation>
|
||||
|
|
@ -10213,11 +10198,6 @@ E-mail: support@kylinos.cn</source>
|
|||
<translation type="vanished">本地图片</translation>
|
||||
<extra-contents_path>/Screenlock/Local Pictures</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<source>Online Pictures</source>
|
||||
<translation type="vanished">线上图片</translation>
|
||||
<extra-contents_path>/Screenlock/Online Pictures</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../plugins/personalized/screenlock/screenlock.cpp" line="211"/>
|
||||
<source>Select</source>
|
||||
|
|
@ -12948,11 +12928,6 @@ E-mail: support@kylinos.cn</source>
|
|||
<source>Mode</source>
|
||||
<translation type="vanished">显示方式</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Online Picture</source>
|
||||
<translation type="vanished">线上图片</translation>
|
||||
<extra-contents_path>/Wallpaper/Online Picture</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<source>Select from</source>
|
||||
<translation type="vanished">选择背景形式</translation>
|
||||
|
|
@ -13000,11 +12975,6 @@ E-mail: support@kylinos.cn</source>
|
|||
<translation type="vanished">本地图片</translation>
|
||||
<extra-contents_path>/Wallpaper/Local Pictures</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<source>Online Pictures</source>
|
||||
<translation type="vanished">线上图片</translation>
|
||||
<extra-contents_path>/Wallpaper/Online Pictures</extra-contents_path>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../../../plugins/personalized/wallpaper/wallpaper.cpp" line="124"/>
|
||||
<location filename="../../../plugins/personalized/wallpaper/wallpaper.cpp" line="143"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue