diff --git a/backup-daemon/databackupproxy.cpp b/backup-daemon/databackupproxy.cpp index ce4be3f..253274b 100755 --- a/backup-daemon/databackupproxy.cpp +++ b/backup-daemon/databackupproxy.cpp @@ -342,6 +342,8 @@ bool DataBackupProxy::recordBackupPoint() m_backupPoint.m_size = Utils::StringBySize(m_size); m_backupPoint.m_time = QDateTime::currentDateTime().toString("yy-MM-dd hh:mm:ss"); m_backupPoint.m_state = BACKUP_PARSE_STATE_FAIL_STRTING; + if (0 < m_backupWrapper.m_frontUid) + m_backupPoint.m_userId = QString::number(m_backupWrapper.m_frontUid); m_backupPoint.m_os = SystemInfo::m_os; m_backupPoint.m_arch = SystemInfo::m_arch; m_backupPoint.m_archdetect = SystemInfo::m_archDetect; diff --git a/backup-daemon/deletebackupproxy.cpp b/backup-daemon/deletebackupproxy.cpp index 04cd11b..b9e4dba 100755 --- a/backup-daemon/deletebackupproxy.cpp +++ b/backup-daemon/deletebackupproxy.cpp @@ -41,6 +41,14 @@ bool DeleteBackupProxy::deleteXmlBackupPoint() xmlPath.replace("//", "/"); ParseBackupList parse(xmlPath); + // 查询节点 + ParseBackupList::BackupPoint backupPoint = parse.findBackupPointByUuid(m_backupWrapper.m_uuid); + if ( int(BackupType::BACKUP_DATA) != backupPoint.m_type + && int(BackupType::INC_BACKUP_DATA) != backupPoint.m_type) { + m_backupWrapper.m_type = backupPoint.m_type; + } + + // 删除节点 if (parse.deleteItem(m_backupWrapper.m_uuid) != ParseBackupList::SUCCESS) { qCritical() << QString("failed to delete %1 from backuplist.xml!").arg(m_backupWrapper.m_uuid); emit workResult(false); @@ -69,6 +77,11 @@ void DeleteBackupProxy::deleteBackupPointDir() QProcess::execute("rm", args); QString time = QDateTime::currentDateTime().toString("yy-MM-dd hh:mm:ss"); - Utils::writeBackupLog(time + "," + m_backupWrapper.m_uuid + "," + QString::number(m_backupWrapper.m_type) + ",,," + QString::number(m_backupWrapper.m_frontUid)+ "," + m_backupWrapper.m_backupName); + if ( int(BackupType::BACKUP_DATA) == m_backupWrapper.m_type + || int(BackupType::INC_BACKUP_DATA) == m_backupWrapper.m_type) { + Utils::writeBackupLog(time + "," + m_backupWrapper.m_uuid + "," + QString::number(m_backupWrapper.m_type) + ",,," + QString::number(m_backupWrapper.m_frontUid)+ "," + m_backupWrapper.m_backupName); + } else { + Utils::writeBackupLog(time + "," + m_backupWrapper.m_uuid + "," + QString::number(m_backupWrapper.m_type) + ",,,," + m_backupWrapper.m_backupName); + } } diff --git a/backup-daemon/udiskdatabackupproxy.cpp b/backup-daemon/udiskdatabackupproxy.cpp index 88d2f68..271e683 100755 --- a/backup-daemon/udiskdatabackupproxy.cpp +++ b/backup-daemon/udiskdatabackupproxy.cpp @@ -278,6 +278,8 @@ bool UDiskDataBackupProxy::recordBackupPointToUdisk() m_backupPoint.m_size = Utils::StringBySize(m_size); m_backupPoint.m_time = QDateTime::currentDateTime().toString("yy-MM-dd hh:mm:ss"); m_backupPoint.m_state = BACKUP_PARSE_STATE_FAIL_STRTING; + if (0 < m_backupWrapper.m_frontUid) + m_backupPoint.m_userId = QString::number(m_backupWrapper.m_frontUid); m_backupPoint.m_os = SystemInfo::m_os; m_backupPoint.m_arch = SystemInfo::m_arch; m_backupPoint.m_archdetect = SystemInfo::m_archDetect; diff --git a/kybackup/aboutdialog.cpp b/kybackup/aboutdialog.cpp index 0a0b21c..f36d173 100755 --- a/kybackup/aboutdialog.cpp +++ b/kybackup/aboutdialog.cpp @@ -27,12 +27,7 @@ AboutDialog::AboutDialog(QWidget *parent) : hints.decorations = MWM_DECOR_BORDER; XAtomHelper::getInstance()->setWindowMotifHint(winId(), hints); - // 设置背景色 this->setAutoFillBackground(true); - QPalette palette = this->palette(); - palette.setColor(QPalette::Window, palette.color(QPalette::Base)); - this->setPalette(palette); - this->setFixedWidth(420); this->setMinimumHeight(420); QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); @@ -146,3 +141,15 @@ AboutDialog::~AboutDialog() { delete ui; } + + +void AboutDialog::paintEvent(QPaintEvent *event) +{ + // 设置背景色 + QPalette palette = this->palette(); + palette.setColor(QPalette::Window, palette.color(QPalette::Base)); + this->setPalette(palette); + QDialog::paintEvent(event); +} + + diff --git a/kybackup/aboutdialog.h b/kybackup/aboutdialog.h index 3656319..67b6c02 100755 --- a/kybackup/aboutdialog.h +++ b/kybackup/aboutdialog.h @@ -18,6 +18,8 @@ public: QString getBackupVersion(); + void paintEvent(QPaintEvent *event); + private: Ui::AboutDialog *ui; }; diff --git a/kybackup/backuppointlistdialog.cpp b/kybackup/backuppointlistdialog.cpp index 27550b7..4690cdb 100755 --- a/kybackup/backuppointlistdialog.cpp +++ b/kybackup/backuppointlistdialog.cpp @@ -84,18 +84,18 @@ BackupPointListDialog::BackupPointListDialog(QWidget *parent, bool isOnlyShowLoc // 列表为空时展示图片 m_labelEmpty = new QLabel(m_tableWidget); if (g_GSettingWrapper.isDarkTheme()) { - QPixmap pixmap(":/images/empty_dark.svg"); + QPixmap pixmap(":/images/empty_dark.png"); m_labelEmpty->setPixmap(pixmap); } else { - QPixmap pixmap(":/images/empty.svg"); + QPixmap pixmap(":/images/empty.png"); m_labelEmpty->setPixmap(pixmap); } connect(GlobelBackupInfo::inst().getGlobalSignals(), &GlobalSignals::styleNameChanged, this, [=](bool isDark) { if (isDark) { - QPixmap pixmap(":/images/empty_dark.svg"); + QPixmap pixmap(":/images/empty_dark.png"); m_labelEmpty->setPixmap(pixmap); } else { - QPixmap pixmap(":/images/empty.svg"); + QPixmap pixmap(":/images/empty.png"); m_labelEmpty->setPixmap(pixmap); } }); diff --git a/kybackup/component/myiconbutton.cpp b/kybackup/component/myiconbutton.cpp index 93dc07c..a10f836 100755 --- a/kybackup/component/myiconbutton.cpp +++ b/kybackup/component/myiconbutton.cpp @@ -9,10 +9,10 @@ MyIconButton::MyIconButton(QWidget *parent) : QPushButton(parent) { - this->setCheckable(true); + this->setCheckable(false); m_iconButton = new QPushButton(this); - m_iconButton->setCheckable(true); + m_iconButton->setCheckable(false); m_iconButton->setFixedSize(QSize(24, 24)); m_iconButton->setFocusPolicy(Qt::NoFocus); m_iconButton->setFlat(true); @@ -61,7 +61,7 @@ void MyIconButton::setDesplayText(const QString &text) void MyIconButton::changePalette(bool checked) { - m_iconButton->setChecked(checked); + // m_iconButton->setChecked(checked); QPalette pal(m_textLabel->palette()); QIcon icon = QIcon::fromTheme(m_themeIconName, QIcon(m_defaultIconName)); QPixmap pix; diff --git a/kybackup/component/ringsprogressbar.cpp b/kybackup/component/ringsprogressbar.cpp index f485016..325145c 100755 --- a/kybackup/component/ringsprogressbar.cpp +++ b/kybackup/component/ringsprogressbar.cpp @@ -28,9 +28,9 @@ void RingsProgressbar::paintEvent(QPaintEvent *) QPen pen = p.pen(); p.setPen(Qt::NoPen); if (g_GSettingWrapper.isDarkTheme()) - p.setBrush(QBrush(QColor(COLOR_LIGHT_BLUE))); - else p.setBrush(QBrush(palette().button().color())); + else + p.setBrush(QBrush(QColor(COLOR_LIGHT_BLUE))); p.drawEllipse(outRect); p.setBrush(QBrush(QColor(COLOR_BLUE))); diff --git a/kybackup/deletebackupdialog.cpp b/kybackup/deletebackupdialog.cpp index 5889ad6..63eca4d 100755 --- a/kybackup/deletebackupdialog.cpp +++ b/kybackup/deletebackupdialog.cpp @@ -20,6 +20,7 @@ DeleteBackupDialog::DeleteBackupDialog(ParseBackupList::BackupPoint backupPonit, ui->setupUi(this); setMinimumSize(450, 138); setMaximumSize(450, 200); + this->setAutoFillBackground(true); // 添加窗管协议 MotifWmHints hints; @@ -29,12 +30,6 @@ DeleteBackupDialog::DeleteBackupDialog(ParseBackupList::BackupPoint backupPonit, XAtomHelper::getInstance()->setWindowMotifHint(winId(), hints); setWindowModality(Qt::WindowModal); - // 设置背景色 - this->setAutoFillBackground(true); - QPalette palette = this->palette(); - palette.setColor(QPalette::Window, palette.color(QPalette::Base)); - this->setPalette(palette); - // 设置标题栏 QHBoxLayout * titleLayout = new QHBoxLayout(); @@ -224,3 +219,13 @@ void DeleteBackupDialog::on_deleteBackup_end(bool result) m_pInterface = nullptr; } +void DeleteBackupDialog::paintEvent(QPaintEvent *event) +{ + // 设置背景色 + QPalette palette = this->palette(); + palette.setColor(QPalette::Window, palette.color(QPalette::Base)); + this->setPalette(palette); + QDialog::paintEvent(event); +} + + diff --git a/kybackup/deletebackupdialog.h b/kybackup/deletebackupdialog.h index 6d5ff1a..bc870b5 100755 --- a/kybackup/deletebackupdialog.h +++ b/kybackup/deletebackupdialog.h @@ -21,6 +21,8 @@ public: explicit DeleteBackupDialog(ParseBackupList::BackupPoint backupPonit, QWidget *parent = nullptr); ~DeleteBackupDialog(); + void paintEvent(QPaintEvent *event); + signals: void deleteFinished(bool result); diff --git a/kybackup/globalbackupinfo.h b/kybackup/globalbackupinfo.h index 8811124..95ea9e0 100755 --- a/kybackup/globalbackupinfo.h +++ b/kybackup/globalbackupinfo.h @@ -26,6 +26,15 @@ public: return m_isManager; } + // 设置当前登录用户id + void setCurUserId(QString curUserId) { + m_curUserId = curUserId; + } + // 当前登录用户id + QString curUserId() { + return m_curUserId; + } + // 设置是否以--restore参数启动的备份还原工具 void setHasArgRestore(bool hasArg_restore) { m_hasArg_restore = hasArg_restore; @@ -97,6 +106,8 @@ public: private: // 是否管理员 bool m_isManager = true; + // 当前登录用户id + QString m_curUserId; // 是否正在进行备份、还原等操作 bool m_isBusy = false; // 是否有备份分区 diff --git a/kybackup/kybackup.pro b/kybackup/kybackup.pro index c358058..0f4e713 100755 --- a/kybackup/kybackup.pro +++ b/kybackup/kybackup.pro @@ -132,7 +132,7 @@ TRANSLATIONS += qt_zh_CN.ts system(rm -f qt_zh_CN.qm) !system(lrelease qt_zh_CN.ts): error("Failed to generate qm") -system(cp qt_zh_CN.qm resource/language) +system(cp qt_zh_CN.qm resource/language/) RESOURCES += \ app.qrc diff --git a/kybackup/main.cpp b/kybackup/main.cpp index 540ac79..7c2d07b 100755 --- a/kybackup/main.cpp +++ b/kybackup/main.cpp @@ -133,11 +133,12 @@ bool isManager() return true; uid_t uid = getuid(); + QString sid = QString::number(uid); + GlobelBackupInfo::inst().setCurUserId(sid); // root用户 if (0 == uid) return true; - QString sid = QString::number(uid); QString userObject = "/org/freedesktop/Accounts/User" + sid; // 创建QDBusInterface diff --git a/kybackup/module/managebackuppointlist.cpp b/kybackup/module/managebackuppointlist.cpp index c218068..c5f9be3 100755 --- a/kybackup/module/managebackuppointlist.cpp +++ b/kybackup/module/managebackuppointlist.cpp @@ -87,6 +87,7 @@ void ManageBackupPointList::insertLines(const QListsetPixmap(pixmap); } else { - QPixmap pixmap(":/images/empty.svg"); + QPixmap pixmap(":/images/empty.png"); labelEmptyLogo->setPixmap(pixmap); } connect(GlobelBackupInfo::inst().getGlobalSignals(), &GlobalSignals::styleNameChanged, this, [=](bool isDark) { if (isDark) { - QPixmap pixmap(":/images/empty_dark.svg"); + QPixmap pixmap(":/images/empty_dark.png"); labelEmptyLogo->setPixmap(pixmap); } else { - QPixmap pixmap(":/images/empty.svg"); + QPixmap pixmap(":/images/empty.png"); labelEmptyLogo->setPixmap(pixmap); } }); @@ -121,6 +121,14 @@ void OperationLog::initOperationLogs(const QList& list) int indexOfRow = 0; for (const BackupWrapper& backupPoint : list) { + // 管理员可看自己用户进行的操作和无用户信息的数据备份（旧备份数据） + if (GlobelBackupInfo::inst().isManager() && (backupPoint.m_frontUid != -1) && backupPoint.m_frontUid != GlobelBackupInfo::inst().curUserId().toInt()) + continue ; + + // 标准用户只能看自己进行的操作 + if (!GlobelBackupInfo::inst().isManager() && backupPoint.m_frontUid != GlobelBackupInfo::inst().curUserId().toInt()) + continue ; + m_tableWidget->insertRow(indexOfRow); setItem(indexOfRow, 0, backupPoint.m_backupName); setItem(indexOfRow, 1, backupPoint.m_uuid); diff --git a/kybackup/module/selectrestorepoint.cpp b/kybackup/module/selectrestorepoint.cpp index a72edea..0c47db1 100755 --- a/kybackup/module/selectrestorepoint.cpp +++ b/kybackup/module/selectrestorepoint.cpp @@ -4,6 +4,7 @@ #include "component/mypushbutton.h" #include "../../common/utils.h" #include "messageboxutils.h" +#include "../globalbackupinfo.h" SelectRestorePoint::SelectRestorePoint(QWidget *parent, BackupPointType backupType, bool isOnlyShowLocal) : BackupPointListDialog(parent, isOnlyShowLocal), @@ -93,6 +94,17 @@ void SelectRestorePoint::insertLines(const QList & int(BackupType::INC_BACKUP_DATA) != backupPoint.m_type) continue; + // 数据备份需要用户隔离 + if (BackupPointType::DATA == m_backupType) { + // 管理员可看自己用户进行的数据备份和无用户信息的数据备份（旧备份数据） + if (GlobelBackupInfo::inst().isManager() && !backupPoint.m_userId.isEmpty() && backupPoint.m_userId != GlobelBackupInfo::inst().curUserId()) + continue ; + + // 标准用户只能看自己进行的操作 + if (!GlobelBackupInfo::inst().isManager() && backupPoint.m_userId != GlobelBackupInfo::inst().curUserId()) + continue ; + } + // 不展示未完成的备份点 if (BACKUP_PARSE_STATE_SUCCESS_STRTING != backupPoint.m_state) continue; diff --git a/kybackup/qt_zh_CN.ts b/kybackup/qt_zh_CN.ts index 0e6244c..40bf81c 100755 --- a/kybackup/qt_zh_CN.ts +++ b/kybackup/qt_zh_CN.ts @@ -9,27 +9,27 @@ 对话框 - + Close 关闭 - + Backup & Restore 备份还原 - + version: 版本： - + The backup tool is a tool that supports system backup and data backup. When the user data is damaged or the system is attacked, the tool can flexibly restore the status of the backup node. A lot of optimization and innovation have been carried out for domestic hardware and software platforms. 麒麟备份还原工具是一款支持系统备份还原和数据备份还原的工具，当用户数据损坏或系统遭受攻击时能够通过该工具灵活的还原到备份节点的状态。针对国产软硬件平台开展了大量的优化和创新。 - + Service & Support: %1 服务与支持团队：%1 @@ -50,32 +50,32 @@ 对话框 - + Backup Name 备份名称 - + UUID 备份标识 - + Backup Time 备份时间 - + Backup Size 备份大小 - + Position 备份位置 - + No Backup 无备份 @@ -83,343 +83,343 @@ DataBackup - + Data Backup 数据备份 - + Only files in the /home, /root, and /data directories can be backed up 仅支持备份/home、/root、/data目录下的文件 - + Only files in the /home, /root, and /data/usershare directories can be backed up 仅支持备份/home、/root、/data/usershare目录下的文件 - + Multi-Spot 多点还原 - + Security 安全可靠 - + Protect Data 防止数据丢失 - + Convenient 便捷快速 - + Start Backup 开始备份 - + Update Backup 备份更新 - - + + Backup Management >> 备份管理 >> - + Please select backup position 请选择备份位置 - - + + local default path : 本地默认路径： - - + + removable devices path : 移动设备： - - + + Select backup data 选择备份数据 - - + + Add 添加 - - + + Select 选择 - - + + Please select file to backup 请选择备份文件 - - - - + + + + Back 上一步 - - - - + + + + Next 下一步 - + Default backup location 默认备份位置 - - - - + + + + checking 环境检测 - - - - + + + + preparing 备份准备 - - - - + + + + backuping 备份中 - - - - + + + + finished 备份完成 - + Recheck 重新检测 - + Checking, wait a moment ... 正在检测，请稍等... - + Do not perform other operations during backup to avoid data loss 备份过程中不要做其它操作，以防数据丢失 - + Check whether the remaining capacity of the backup partition is sufficient 检测备份分区空间是否充足··· - + Check whether the remaining capacity of the removable device is sufficient 检测移动设备空间是否充足··· - + Check success 检测成功 - + The storage for backup is enough 备份空间充足 - + Make sure the computer is plugged in or the battery level is above 60% 请确保电脑已连接电源或电量超过60% - + Check failure 检测失败 - - + + Program lock failed, please retry 程序锁定失败，请重试 - - + + There may be other backups or restores being performed 可能有其它备份/还原等任务在执行 - - + + Unsupported task type 不支持的任务类型 - - + + No processing logic was found in the service 没有找到相应的处理逻辑 - - + + Failed to mount the backup partition 备份分区挂载失败 - - + + Check whether there is a backup partition 检查是否有备份分区 - + The filesystem of device is vfat format 移动设备的文件系统是vfat格式 - + Please change filesystem format to ext3、ext4 or ntfs 请换成ext3、ext4、ntfs等文件系统格式 - + The device is read only 移动设备是只读挂载的 - + Please chmod to rw 请修改为读写模式 - - + + The storage for backup is not enough 备份空间不足 - - + + Retry after release space 建议释放空间后重试 - - + + Other backup or restore task is being performed 其它备份还原等操作正在执行 - - + + Please try again later 请稍后重试 - + Backup Name 备份名称 - - + + Name already exists 名称已存在 - + Cancel 取消 - + Do not use computer in case of data loss 请勿使用电脑，以防数据丢失 - + Failed to create the backup point directory 创建备份目录失败 - + Please check backup partition permissions 请检查备份分区权限 - + The backup had been canceled 备份已取消 - + Re-initiate the backup if necessary 如需要可重新进行备份 - + An error occurred during backup 备份期间发生错误 - + Error messages refer to log file : /var/log/backup.log 错误信息请参考日志文件：/var/log/backup.log - + Home Page 返回首页 - + Retry 再试一次 - + The backup is successful 备份成功 - + The backup is failed 备份失败 @@ -427,221 +427,221 @@ DataRestore - + Data Restore 数据还原 - + Backed up first, then can be restored 必须先进行数据备份，否则无法进行数据还原操作 - + Fast Recovery 快速恢复 - + Security 安全可靠 - + Protect Data 解决数据丢失 - + Independent 自主操作 - + Start Restore 开始还原 - - - + + + checking 环境检测 - - - + + + restoring 还原中 - - - + + + finished 还原完成 - + Back 上一步 - + Next 下一步 - + Recheck 重新检测 - + Checking, wait a moment ... 正在检测，请稍等... - + Check whether the restore environment meets the requirements 检查恢复环境是否符合要求 - + Do not perform other operations during restore to avoid data loss 还原期间不要做其它操作，以防数据丢失 - + Check success 检测成功 - - + + Do not use computer in case of data loss 请勿使用电脑，以防数据丢失 - + Make sure the computer is plugged in or the battery level is above 60% 请确保电脑已连接电源或电量超过60% - + Check failure 检测失败 - - + + Program lock failed, please retry 程序锁定失败，请重试 - - + + There may be other backups or restores being performed 可能有其它备份/还原等任务在执行 - - + + Unsupported task type 不支持的任务类型 - - + + No processing logic was found in the service 没有找到相应的处理逻辑 - - + + The .user.txt file does not exist .user.txt文件不存在 - - - - - - + + + + + + Backup points may be corrupted 备份点可能被损坏 - - + + The .exclude.user.txt file does not exist .exclude.user.txt文件不存在 - - + + The backup point data directory does not exist 备份点数据目录不存在 - + Failed to rsync /boot/efi 同步/boot/efi失败 - + Check the mounting mode of the /boot/efi partition 请检查/boot/efi分区挂载方式 - + Failed to prepare the restore directory 还原目录准备失败 - + Refer to log :/var/log/backup.log for more information 更多信息请参考日志/var/log/backup.log - + An error occurred during restore 还原时发生错误 - + Error messages refer to log file : /var/log/backup.log 错误信息请参考日志文件：/var/log/backup.log - + Home Page 返回首页 - + Retry 再试一次 - + Reboot System 重启系统 - + Successfully restoring the data 数据还原成功 - + The system needs to reboot. Otherwise, some tools cannot be used. 系统需要重启，否则某些工具可能无法使用 - + Restoring the data failed 数据还原失败 @@ -654,43 +654,43 @@ 对话框 - - + + Please wait while data is being removed 正在删除数据，请稍候 - + Removing backup point... 正在删除备份点... - + Ok 确定 - + Other backup or restore task is being performed 其它备份还原等操作正在执行 - + Program lock failed, please retry 程序锁定失败，请重试 - + Unsupported task type 不支持的任务类型 - + Deleted backup successfully. 删除备份成功。 - + Failed to delete backup. 删除备份失败。 @@ -731,294 +731,294 @@ GhostImage - + Ghost Image Ghost镜像 - + A ghost image file can only be created after backup system to local disk 必须先进行本地系统备份，否则无法创建镜像文件 - + Simple 操作简单 - + Fast 创建速度快 - + Security 安全可靠 - + Timesaving 节省时间 - + Start Ghost 创建镜像 - + Please select storage location 请选择存储位置 - + local default path : 本地默认路径： - + removable devices path : 移动设备： - - + + Back 上一步 - - + + Next 下一步 - - - + + + checking 环境检测 - - - + + + ghosting 创建中 - - - + + + finished 创建完成 - + Recheck 重新检测 - + Checking, wait a moment ... 正在检测，请稍等... - + Check whether the conditions for creating an ghost image are met 检测是否具备制作Ghost镜像条件 - + Do not perform other operations during creating an ghost image to avoid data loss 制作Ghost镜像期间不要做其它操作，以防数据丢失 - + Check success 检测成功 - + The storage space is enough 存储空间充足 - + Make sure the computer is plugged in or the battery level is above 60% 请确保电脑已连接电源或电量超过60% - + Check failure 检测失败 - - + + Program lock failed, please retry 程序锁定失败，请重试 - - + + There may be other backups or restores being performed 可能有其它备份/还原等任务在执行 - - + + Unsupported task type 不支持的任务类型 - - + + No processing logic was found in the service 没有找到相应的处理逻辑 - - + + Failed to mount the backup partition 备份分区挂载失败 - - + + Check whether there is a backup partition 检查是否有备份分区 - - + + The filesystem of device is vfat format 移动设备的文件系统是vfat格式 - - + + Please change filesystem format to ext3、ext4 or ntfs 请换成ext3、ext4、ntfs等文件系统格式 - - + + The device is read only 移动设备是只读挂载的 - - + + Please chmod to rw 请修改为读写模式 - - + + The storage for ghost is not enough Ghost存储空间不足 - - - - + + + + Retry after release space 建议释放空间后重试 - - + + There is not enough space for temporary .kyimg file 没有足够的空间存放临时.kyimg文件 - - + + Other backup or restore task is being performed 其它备份还原等操作正在执行 - - + + Please try again later 请稍后重试 - - + + The backup node does not exist 相应的备份节点不存在 - - + + Check whether the backup point has been deleted 请检查备份点是否已经被删除 - + Cancel 取消 - + Do not use computer in case of data loss 请勿使用电脑，以防数据丢失 - + The data is being compressed to the local disk, please wait patiently... 正压缩数据到本地磁盘，请耐心等待... - + Transferring image file to mobile device, about to be completed... 正在传输image文件到移动设备，即将完成... - + The image creation had been canceled 已取消制作Ghost镜像 - + Re-initiate the image creation if necessary 如需要可以重新进行Ghost镜像制作 - + An error occurred during make ghost image 制作Ghost镜像时发生错误 - + Error messages refer to log file : /var/log/backup.log 错误信息请参考日志文件：/var/log/backup.log - + Home Page 返回首页 - + Retry 再试一次 - + Ghost image creation is successful Ghost镜像创建成功 - + You can view it in the directory : 可以在后面目录中查看： - + Ghost image creation is failed Ghost镜像创建失败 @@ -1026,8 +1026,8 @@ LeftsiderbarWidget - + Backup & Restore 备份还原 @@ -1050,37 +1050,33 @@ 关闭 - Theme - 主题 + 主题 - Auto - 跟随主题 + 跟随主题 - Light - 浅色主题 + 浅色主题 - Dark - 深色主题 + 深色主题 - + Help 帮助 - + About 关于 - + Exit 退出 @@ -1113,12 +1109,12 @@ 删除 - + backup finished 备份完成 - + backup unfinished 备份未完成 @@ -1126,72 +1122,72 @@ OperationLog - + No operation log 无操作日志 - + Backup Name 备份名称 - + UUID 备份标识 - + Operation 操作 - + Operation Time 操作时间 - + new system backup 新建系统备份 - + udpate system backup 增量系统备份 - + new data backup 新建数据备份 - + update data backup 更新数据备份 - + restore system 系统还原 - + restore retaining user data 保留用户数据还原 - + restore data 数据还原 - + delete backup 删除备份 - + make ghost image 制作ghost镜像 @@ -1209,12 +1205,12 @@ 出厂备份 - + Backup State 备份状态 - + PrefixPath @@ -1222,15 +1218,15 @@ - - - - - - + + + + + + - - + + Warning 警告 @@ -1245,19 +1241,19 @@ - - - - - - - - - + + + + + + + + + - - + + Ok 确定 @@ -1274,13 +1270,13 @@ - - - - + + + + - - + + Information 提示 @@ -1300,65 +1296,65 @@ 备份还原工具 - + An exception occurred when mounting backup partition. 挂载备份分区时发生错误。 - + Please check if the backup partition exists which can be created when you install the Operating System. 请检查备份还原分区是否存在，在安装操作系统时必须创建备份还原分区。 - + Failed to mount backup partition. 挂载备份分区失败。 - - + + It's busy, please wait 系统正忙，请稍等 - - + + Please select a backup file or directory 请选择一个备份文件或目录 - - - + + + Are you sure to cancel the operation？ 确定取消当前操作？ - - - + + + - - - + + + Cancel 取消 - - - + + + Continue 继续 - + Contains the user's home directory, which need to reboot after restoration. Are you sure to continue? 包含用户家目录，还原完成后需要重启系统。是否继续？ - + Please select one backup to continue. 请选择一个备份再继续。 @@ -1368,29 +1364,29 @@ 是否确定删除此备份？ - - + + Udisk Device: 移动设备： - - + + Local Disk: 本地磁盘： - + Do you want to continue? 是否继续？ - + Other machine: 异机备份： - + Restore factory settings, your system user data will not be retained. Are you sure to continue? 恢复出厂设置，您的系统用户数据都将会消失。是否继续？ @@ -1398,22 +1394,22 @@ SelectRestorePoint - + System Backup Information 系统备份信息 - + Data Backup Information 数据备份信息 - + Ok 确定 - + Udisk Device: 移动设备： @@ -1421,321 +1417,321 @@ SystemBackup - + System Backup 系统备份 - + Can be restored when files are damaged or lost 系统原始文件受损或丢失时可以进行还原 - + Multi-Spot 多还原点 - + Small Size 体积小 - + Security 安全保障 - + Simple 操作简单 - + Start Backup 开始备份 - - + + Backup Management >> 备份管理 >> - + Please select backup position 请选择备份位置 - + local default path : 本地默认路径： - + removable devices path : 移动设备： - - - + + + Back 上一步 - - - + + + Next 下一步 - - - - + + + + checking 环境检测 - - - - + + + + preparing 备份准备 - - - - + + + + backuping 备份中 - - - - + + + + finished 备份完成 - + Recheck 重新检测 - + Checking, wait a moment ... 正在检测，请稍等... - + Do not perform other operations during backup to avoid data loss 备份期间不要做其它操作，以防数据丢失 - + Check whether the remaining capacity of the backup partition is sufficient 检测备份分区空间是否充足··· - + Check whether the remaining capacity of the removable device is sufficient 检测移动设备空间是否充足··· - + Check success 检测成功 - + The storage for backup is enough 备份空间充足 - + Make sure the computer is plugged in or the battery level is above 60% 请确保电脑已连接电源或电量超过60% - + Check failure 检测失败 - - + + Program lock failed, please retry 程序锁定失败，请重试 - - + + There may be other backups or restores being performed 可能有其它备份/还原等任务在执行 - - + + Unsupported task type 不支持的任务类型 - - + + No processing logic was found in the service 没有找到相应的处理逻辑 - - + + Failed to mount the backup partition 备份分区挂载失败 - - + + Check whether there is a backup partition 检查是否有备份分区 - - + + The filesystem of device is vfat format 移动设备的文件系统是vfat格式 - - + + Please change filesystem format to ext3、ext4 or ntfs 请换成ext3、ext4、ntfs等文件系统格式 - - + + The device is read only 移动设备是只读挂载的 - - + + Please chmod to rw 请修改为读写模式 - - + + The storage for backup is not enough 备份空间不足 - - + + Retry after release space 建议释放空间后重试 - - + + Other backup or restore task is being performed 其它备份还原等操作正在执行 - - + + Please try again later 请稍后重试 - + Backup Name 备份名称 - - + + Name already exists 名称已存在 - + factory backup 出厂备份 - + Cancel 取消 - + Do not use computer in case of data loss 请勿使用电脑，以防数据丢失 - + Failed to create the backup point directory 创建备份目录失败 - + Please check backup partition permissions 请检查备份分区权限 - + The system is being compressed to the local disk, please wait patiently... 正压缩系统到本地磁盘，请耐心等待... - + Transferring image file to mobile device, about to be completed... 正在传输image文件到移动设备，即将完成... - + The backup had been canceled 已取消备份 - + Re-initiate the backup if necessary 如需要可重新进行备份 - - + + An error occurred during backup 备份时发生错误 - - + + Error messages refer to log file : /var/log/backup.log 错误信息请参考日志文件：/var/log/backup.log - + Home Page 返回首页 - + Retry 再试一次 - + The backup is successful 备份成功 - + The backup is failed 备份失败 @@ -1743,232 +1739,232 @@ SystemRestore - + System Restore 系统还原 - + You can restore the system to its previous state 在您遇到问题时可将系统还原到以前的状态 - + Simple 操作简单 - + Security 安全可靠 - + Repair 修复系统损坏 - + Independent 自主操作 - + Start Restore 开始还原 - + Factory Restore 出厂还原 - + Retaining User Data 保留用户数据 - - - + + + checking 环境检测 - - - + + + restoring 还原中 - - - + + + finished 还原完成 - + Back 上一步 - + Next 下一步 - + Recheck 重新检测 - + Checking, wait a moment ... 正在检测，请稍等... - + Check whether the restore environment meets the requirements 检查恢复环境是否符合要求 - + Do not perform other operations during restore to avoid data loss 还原期间不要做其它操作，以防数据丢失 - + Check success 检测成功 - + The system will reboot automatically after the restore is successful 还原成功后系统将自动重启 - + Make sure the computer is plugged in or the battery level is above 60% 请确保电脑已连接电源或电量超过60% - + Check failure 检测失败 - - + + Program lock failed, please retry 程序锁定失败，请重试 - - + + There may be other backups or restores being performed 可能有其它备份/还原等任务在执行 - - + + Unsupported task type 不支持的任务类型 - - + + No processing logic was found in the service 没有找到相应的处理逻辑 - - + + The .user.txt file does not exist .user.txt文件不存在 - - - - - - + + + + + + Backup points may be corrupted 备份点可能被损坏 - - + + The .exclude.user.txt file does not exist .exclude.user.txt文件不存在 - - + + The backup point data directory does not exist 备份点数据目录不存在 - - + + Failed to rsync /boot/efi 同步/boot/efi失败 - - + + Check the mounting mode of the /boot/efi partition 请检查/boot/efi分区挂载方式 - + Do not use computer in case of data loss 请勿使用电脑，以防数据丢失 - + Failed to prepare the restore directory 还原目录准备失败 - + Refer to log :/var/log/backup.log for more information 更多信息请参考日志/var/log/backup.log - + An error occurred during restore 还原时发生错误 - + Error messages refer to log file : /var/log/backup.log 错误信息请参考日志文件：/var/log/backup.log - + Home Page 返回首页 - + Retry 再试一次 - + Successfully restoring the system 系统还原成功 - + The system will automatically reboot 系统将自动重启 - + Restoring the system failed 系统还原失败 diff --git a/kybackup/resource/language/qt_zh_CN.qm b/kybackup/resource/language/qt_zh_CN.qm new file mode 100644 index 0000000..d9b94c0 Binary files /dev/null and b/kybackup/resource/language/qt_zh_CN.qm differ