diff --git a/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp b/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp
index 7c09e24..86d4ca6 100644
--- a/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp
+++ b/InstructorsAndTrainees/connectorToServer/Core/notifycontroller.cpp
@@ -11,6 +11,6 @@ void NotifyController::showWarning(QString text)
warning.setText(text);
warning.setIcon(QMessageBox::Warning);
- warning.setWindowTitle(tr("Ошибка"));
+ warning.setWindowTitle(tr("Error"));
warning.exec();
}
diff --git a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
index 42c71ac..166eb7e 100644
--- a/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
+++ b/InstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
@@ -364,17 +364,17 @@ void RecognizeSystem::xmlParser(QByteArray array)
if (value == "BASEDELETETRY")
{
- emit sigNotify(tr("Нельзя удалять базовую версию"));
+ emit sigNotify(tr("You cannot delete the basic version!"));
}
if (value == "TRYACTIVEDELETE")
{
- emit sigNotify(tr("Нельзя удалять активную версию"));
+ emit sigNotify(tr("You cannot delete the active version"));
}
if (value == "DUPLICATEVERNAME")
{
- emit sigNotify(tr("Такое имя уже существет"));
+ emit sigNotify(tr("This name already exists"));
}
}
}
diff --git a/InstructorsAndTrainees/widgets/newversionwidget.ui b/InstructorsAndTrainees/widgets/newversionwidget.ui
index 03871e5..b5d4795 100644
--- a/InstructorsAndTrainees/widgets/newversionwidget.ui
+++ b/InstructorsAndTrainees/widgets/newversionwidget.ui
@@ -67,7 +67,7 @@
- Базовая версия:
+ Basic version:
@@ -118,7 +118,7 @@
- Новое название:
+ New name version:
@@ -189,7 +189,7 @@
- Создать
+ Create
@@ -218,7 +218,7 @@
- Отмена
+ Cancel
diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.cpp b/InstructorsAndTrainees/widgets/versionselectwidget.cpp
index 60c15be..22b1b31 100644
--- a/InstructorsAndTrainees/widgets/versionselectwidget.cpp
+++ b/InstructorsAndTrainees/widgets/versionselectwidget.cpp
@@ -22,7 +22,7 @@ void VersionSelectWidget::initialize(SendSystem *sendSystem,VersionContainer *ve
connect(this,&VersionSelectWidget::sigSendNotify,notifyController,&NotifyController::showWarning,Qt::AutoConnection);
this->versionContainer = versionContainer;
hide();
- setWindowTitle(tr("Управление версиями"));
+ setWindowTitle(tr("Version control"));
}
void VersionSelectWidget::fillView(QList *serverData)
@@ -44,10 +44,10 @@ void VersionSelectWidget::on_verListView_itemDoubleClicked(QListWidgetItem *item
{
if(data->getViewName() == item->text())
{
- QString info = "Имя версии: " + data->getViewName() + "\n";
- info.append("Создан: " + data->getCreateData().toString() + "\n");
- info.append("Изменяемый: " + changableText(data->getIsChangeable()) + "\n");
- info.append("Автор: " + data->getAuthor());
+ QString info = tr("Version name: ") + data->getViewName() + "\n";
+ info.append(tr("Created: ") + data->getCreateData().toString() + "\n");
+ info.append(tr("Changeable: ") + changableText(data->getIsChangeable()) + "\n");
+ info.append(tr("Author: ") + data->getAuthor());
ui->infoValue->setText(info);
selectedVersion = data;
}
@@ -56,8 +56,8 @@ void VersionSelectWidget::on_verListView_itemDoubleClicked(QListWidgetItem *item
QString VersionSelectWidget::changableText(bool flag)
{
- if(flag) return tr("Да");
- else return tr("Нет");
+ if(flag) return tr("Yes");
+ else return tr("No");
}
@@ -74,7 +74,7 @@ void VersionSelectWidget::sendCopyEmit(QString newName)
if (selectedVersion == nullptr)
{
- sigSendNotify(tr("Версия не выбрана"));
+ sigSendNotify(tr("Version not selected"));
return;
}
@@ -86,7 +86,7 @@ void VersionSelectWidget::on_DeleteVersionButton_clicked()
{
if (selectedVersion == nullptr)
{
- sigSendNotify(tr("Версия не выбрана"));
+ sigSendNotify(tr("Version not selected"));
return;
}
@@ -97,7 +97,7 @@ void VersionSelectWidget::on_switchServerVersionButton_clicked()
{
if (selectedVersion == nullptr)
{
- sigSendNotify(tr("Версия не выбрана"));
+ sigSendNotify(tr("Version not selected"));
return;
}
diff --git a/InstructorsAndTrainees/widgets/versionselectwidget.ui b/InstructorsAndTrainees/widgets/versionselectwidget.ui
index 6dbca69..af13a94 100644
--- a/InstructorsAndTrainees/widgets/versionselectwidget.ui
+++ b/InstructorsAndTrainees/widgets/versionselectwidget.ui
@@ -48,15 +48,15 @@
- Calibri
- 12
+ MS Shell Dlg 2
+ 8
Qt::PreventContextMenu
- Доступные версии на сервере
+ Available versions on the server:
@@ -103,7 +103,7 @@
- Создать копию
+ Create copy
@@ -127,7 +127,7 @@
- Удалить
+ Delete
@@ -147,7 +147,7 @@
- Переключить версию сервера
+ Change server version
@@ -175,7 +175,7 @@
- Информация:
+ Info:
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
@@ -185,7 +185,7 @@
-
- Тут будет информация о версии...
+ Double click on the version to see information...
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
@@ -220,7 +220,7 @@
-
- Текущая версия сервера:
+ Current server version: