对关机安装的词条做出修改

backend/SystemUpdater/UpdateManager.py

@@ -138,7 +138,7 @@ class UpdateManager():
                 install_backend.start()
             elif self.inhibit_lock != None:
                 self.inhibit_lock.close()
-                logging.info("Receive Shutdown Signal and No need to install...")
+                logging.info("Releasing the shutdown lock...")
         except Exception as e:
             logging.error(e)
 
@@ -474,7 +474,7 @@ class UpdateManager():
                 if pkg_json.is_installed:
                     #是否可升级
                     if pkg_json.is_upgradable:
-                        self.dbusController.UpdateDetectStatusChanged(95,_("group configuration being updated"))
+                        self.dbusController.UpdateDetectStatusChanged(95,_("Group configuration being updated"))
                         logging.info("Check: groups JSON ConfigPkgs(%s) start upgrading From %s to %s...",self.SELF_PKG_NAME,\
                                         pkg_json.installed.source_version,pkg_json.candidate.source_version)
                         pkg_json.mark_upgrade()
@@ -487,7 +487,7 @@ class UpdateManager():
                     else:
                         logging.info("Check: ConfigPkgs(%s:%s) No need to upgrade...",self.GROUPS_PKG_NAME,pkg_json.installed.source_version)
                 else:
-                    self.dbusController.UpdateDetectStatusChanged(95,_("group configuration being updated"))
+                    self.dbusController.UpdateDetectStatusChanged(95,_("Group configuration being updated"))
                     logging.info("Check: groups JSON ConfigPkgs(%s) start new installing...",self.GROUPS_PKG_NAME)
                     pkg_json.mark_install()
                     self.start_install(InstallBackend.MODE_INSTALL_SINGLE,True)

backend/SystemUpdater/backend/InstallBackendAptdaemon.py

@@ -116,6 +116,7 @@ class InstallBackendAptdaemon(InstallBackend):
             if self.action == self.ACTION_INSTALLONLY:
                 #关机安装模式 解除禁止关机锁
                 self.window_maininhibit_lock.close()
+                logging.info("Releasing the shutdown lock...")
             else:
                 #超时只单独进行解锁关机
                 unLockedEnableShutdown()
@@ -379,7 +380,7 @@ class InstallBackendAptdaemon(InstallBackend):
             self.window_main.dbusController.UpdateDloadAndInstStaChanged(upgrade_content,progress,status,details)
         elif action == self.ACTION_INSTALLONLY:
             # 写入进度 到plymouth
-            self._message_to_plymouth(_("安装进度: ")+str(progress)+'%')
+            self._message_to_plymouth(_("Installation progress: ")+str(progress)+'%'+'...')
             self.window_main.dbusController.UpdateDloadAndInstStaChanged(upgrade_content,progress,status,details)
 
         elif action == self.ACTION_DOWNLOADONLY:

backend/SystemUpdater/backend/__init__.py

@@ -461,6 +461,8 @@ class InstallBackend():
                         self.window_main.dbusController.Quit(None)
                     elif self.window_main.APTD_PKG_NAME in self.cache and self.cache[self.window_main.APTD_PKG_NAME] in self.cache.get_changes():
                         #升级本身完成后 直接重启aptd
+                        error_string = _("Update Manager upgrade is complete, please restart the control panel before performing the system update")
+                        self.window_main.dbusController.DistUpdateDetectFinished(False,[self.window_main.APTD_PKG_NAME],error_string,error_desc)
                         self.window_main.dbusController.make_aptdeamon_restart()
                     else:
                         #只有安装配置文件包 才会走到此处
@@ -530,10 +532,10 @@ class InstallBackend():
                 #安装完成之后清空下载列表
                 self._update_to_config([],[],[])
 
-                self._message_to_plymouth(_("安装完成即将关机"))
+                self._message_to_plymouth(_("Installation successful, about to shut down")+'...')
 
             else:
-                self._message_to_plymouth(_("安装失败即将关机"))
+                self._message_to_plymouth(_("Installation failed, about to shut down")+'...')
             
             upgrade_content = self.now_upgrade.upgrade_groups + self.now_upgrade.single_pkgs
             self.window_main.dbusController.UpdateInstallFinished(success,upgrade_content,error_string,error_desc)
@@ -541,6 +543,7 @@ class InstallBackend():
             #释放锁 允许关机
             if self.window_main.inhibit_lock != None:
                 self.window_main.inhibit_lock.close()
+                logging.info("Releasing the shutdown lock...")
 
         elif action == self.ACTION_DOWNLOADONLY:
             upgrade_content = self.now_upgrade.upgrade_groups + self.now_upgrade.single_pkgs

backend/po/zh_CN.po

@@ -2580,9 +2580,18 @@ msgstr "本次更新无法检测到可升级的软件包。"
 msgid "read important list failed"
 msgstr "无法读取推送升级列表，请稍后再试"
 
-msgid "group configuration being updated"
+msgid "Group configuration being updated"
 msgstr "正在更新分组配置"
 
+msgid "Installation progress: "
+msgstr "安装进度: "
+
+msgid "Installation successful, about to shut down"
+msgstr "安装成功，即将关机"
+
+msgid "Installation failed, about to shut down"
+msgstr "安装失败，即将关机"
+
 msgid "groups JSON ConfigPkgs install failed"
 msgstr "无法安装分组配置文件，请稍后再试"