calculate
/
calculate-utils-2.2-install-gui
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed page with users. Fixed translations.

Browse Source
new_gui
Ivan Loskutov 14 years ago
parent 8e784f6358
commit 58853d5f2d
4 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File

20
src/pageusers.cpp
Unescape View File

@ -32,8 +32,8 @@ PageUsers::PageUsers()
// add default guest user // add default guest user
m_migratedUsers = CalculateConfig::instance()->getValue("def_cl_migrate_user").toStringList(); m_migratedUsers = CalculateConfig::instance()->getValue("def_cl_migrate_user").toStringList();
if ( !m_migratedUsers.contains("guest") ) // if ( !m_migratedUsers.contains("guest") )
m_lstUsers->addItem("guest"); // m_lstUsers->addItem("guest");
checkPasswords(); checkPasswords();
} }
@ -131,6 +131,8 @@ void PageUsers::retranslateUi()
if ( m_migratedUsers.size() > 0 ) if ( m_migratedUsers.size() > 0 )
m_labMigratedUsers->setText( tr("These user accounts will be migrated: ") + m_migratedUsers.join(", ") ); m_labMigratedUsers->setText( tr("These user accounts will be migrated: ") + m_migratedUsers.join(", ") );
else
m_labMigratedUsers->setText( tr("If the users will not be added, the 'guest' user be created automatically."));
} }
void PageUsers::show() void PageUsers::show()
@ -153,12 +155,6 @@ void PageUsers::addUser()
if ( userDlg->exec() == QDialog::Accepted ) if ( userDlg->exec() == QDialog::Accepted )
{ {
if (m_lstUserInfo.isEmpty())
{
// delete guest from list
m_lstUsers->clear();
}
UserInfo userInfo = userDlg->getUserInfo(); UserInfo userInfo = userDlg->getUserInfo();
if ( findUserName(userInfo) == -1 && !m_migratedUsers.contains(userInfo.name) ) if ( findUserName(userInfo) == -1 && !m_migratedUsers.contains(userInfo.name) )
@ -180,7 +176,6 @@ void PageUsers::delUser()
// qDebug() << "del user"; // qDebug() << "del user";
if (m_lstUserInfo.isEmpty()) if (m_lstUserInfo.isEmpty())
{ {
QMessageBox::critical( this, tr("Error"), tr("User guest can't be deleted.") );
return; return;
} }
else else
@ -190,12 +185,6 @@ void PageUsers::delUser()
{ {
delete m_lstUsers->takeItem(index); delete m_lstUsers->takeItem(index);
m_lstUserInfo.removeAt(index); m_lstUserInfo.removeAt(index);
if (m_lstUserInfo.isEmpty())
{
if ( !m_migratedUsers.contains("guest") )
m_lstUsers->addItem("guest");
}
} }
updateConfig(); updateConfig();
} }
@ -206,7 +195,6 @@ void PageUsers::modifyUser()
// qDebug() << "modify user"; // qDebug() << "modify user";
if (m_lstUserInfo.isEmpty()) if (m_lstUserInfo.isEmpty())
{ {
QMessageBox::critical( this, tr("Error"), tr("User guest can't be modified.") );
return; return;
} }
else else

36
translations/cl-install-gui_bg.ts
Unescape View File

@ -266,19 +266,19 @@
<name>PageMountPoints</name> <name>PageMountPoints</name>
<message> <message>
<source>Mount points</source> <source>Mount points</source>
<translation type="unfinished">Точки на монтиране</translation> <translation>Точки на монтиране</translation>
</message> </message>
<message> <message>
<source>Partition</source> <source>Partition</source>
<translation type="unfinished">Дял</translation> <translation>Дял</translation>
</message> </message>
<message> <message>
<source>Label</source> <source>Label</source>
<translation type="unfinished">Етикет</translation> <translation>Етикет</translation>
</message> </message>
<message> <message>
<source>Size</source> <source>Size</source>
<translation type="unfinished">Размер</translation> <translation>Размер</translation>
</message> </message>
<message> <message>
<source>Mount point</source> <source>Mount point</source>
@ -290,7 +290,7 @@
</message> </message>
<message> <message>
<source>Format</source> <source>Format</source>
<translation type="unfinished">Форматиране</translation> <translation>Форматиране</translation>
</message> </message>
<message> <message>
<source>Select mount points:</source> <source>Select mount points:</source>
@ -302,15 +302,15 @@
</message> </message>
<message> <message>
<source>Information</source> <source>Information</source>
<translation type="unfinished">Информация</translation> <translation>Информация</translation>
</message> </message>
<message> <message>
<source>You select auto partitioning. Press &quot;Next&quot; to continue.</source> <source>You select auto partitioning. Press &quot;Next&quot; to continue.</source>
<translation type="unfinished">Избрахте автоматично разделяне. Натиснете Напред за да продължите.</translation> <translation>Избрахте автоматично разделяне. Натиснете Напред за да продължите.</translation>
</message> </message>
<message> <message>
<source>Warning</source> <source>Warning</source>
<translation type="unfinished">Внимание</translation> <translation>Внимание</translation>
</message> </message>
<message> <message>
<source>Select mount point for /</source> <source>Select mount point for /</source>
@ -318,11 +318,11 @@
</message> </message>
<message> <message>
<source>no</source> <source>no</source>
<translation type="unfinished">не</translation> <translation>не</translation>
</message> </message>
<message> <message>
<source>YES</source> <source>YES</source>
<translation type="unfinished">ДА</translation> <translation>ДА</translation>
</message> </message>
<message> <message>
<source>Duplicate mount point %1</source> <source>Duplicate mount point %1</source>
@ -356,7 +356,7 @@ To modify the mount point, double-click it.</source>
</message> </message>
<message> <message>
<source>To continue You need to choose partition for mount point %1.</source> <source>To continue You need to choose partition for mount point %1.</source>
<translation type="unfinished">За да продължите изберете раздел за точка на монтиране %1</translation> <translation>За да продължите изберете раздел за точка на монтиране %1</translation>
</message> </message>
<message> <message>
<source>Adding is not possible. All partitions is busy.</source> <source>Adding is not possible. All partitions is busy.</source>
@ -364,11 +364,11 @@ To modify the mount point, double-click it.</source>
</message> </message>
<message> <message>
<source>Root partition can&apos;t be deleted</source> <source>Root partition can&apos;t be deleted</source>
<translation type="unfinished">Дял / не може да бъде изтрит.</translation> <translation>Дял / не може да бъде изтрит.</translation>
</message> </message>
<message> <message>
<source>Migrated mount point can&apos;t be deleted. Use &apos;none&apos; for disabling migration.</source> <source>Migrated mount point can&apos;t be deleted. Use &apos;none&apos; for disabling migration.</source>
<translation type="unfinished">... точка за монтиране не може да бъде изтрита. Използвайте none в име на раздела за деактивиране на прехвърлянето.</translation> <translation type="unfinished">Точка на монтиране която ще се използва в новата система не може да бъде изтрита. Използвайте none в име на раздела за деактивиране на прехвърлянето.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -456,11 +456,11 @@ For modifying user - double click it.</source>
</message> </message>
<message> <message>
<source>User guest can&apos;t be deleted.</source> <source>User guest can&apos;t be deleted.</source>
<translation type="unfinished">Потребител guest не може да бъде изтрит.</translation> <translation type="obsolete">Потребител guest не може да бъде изтрит.</translation>
</message> </message>
<message> <message>
<source>User guest can&apos;t be modified.</source> <source>User guest can&apos;t be modified.</source>
<translation type="unfinished">Потребител guest не може да бъде променян.</translation> <translation type="obsolete">Потребител guest не може да бъде променян.</translation>
</message> </message>
<message> <message>
<source>Passwords match</source> <source>Passwords match</source>
@ -472,7 +472,11 @@ For modifying user - double click it.</source>
</message> </message>
<message> <message>
<source>These user accounts will be migrated: </source> <source>These user accounts will be migrated: </source>
<translation type="unfinished"></translation> <translation type="unfinished">Профилите на тези потребители ще бъдат прехвърлени:</translation>
</message>
<message>
<source>If the users will not be added, the &apos;guest&apos; user be created automatically.</source>
<translation type="unfinished">Ако не бъдат добавени потребители, потребител &apos;guest&apos; ще бъде създаден автоматично.</translation>
</message> </message>
</context> </context>
<context> <context>

19
translations/cl-install-gui_ru.ts
Unescape View File

@ -290,7 +290,7 @@
</message> </message>
<message> <message>
<source>Format</source> <source>Format</source>
<translation type="unfinished">Форматировать</translation> <translation>Форматировать</translation>
</message> </message>
<message> <message>
<source>Select mount points:</source> <source>Select mount points:</source>
@ -351,11 +351,12 @@ system</source>
<message> <message>
<source>Choose mount points for the installation. You need at least a root / partition. <source>Choose mount points for the installation. You need at least a root / partition.
To modify the mount point, double-click it.</source> To modify the mount point, double-click it.</source>
<translation type="unfinished">Выберите точки монтирования для установки. Минимально необходимо выбрать раздел для / раздела. Для редактирования созданых точек монтирования, используйте двойной щелчек на ней.</translation> <translation type="unfinished">Выберите точки монтирования для установки. Минимально необходимо выбрать раздел для / раздела.
Для редактирования созданых точек монтирования, используйте двойной щелчек на ней.</translation>
</message> </message>
<message> <message>
<source>To continue You need to choose partition for mount point %1.</source> <source>To continue You need to choose partition for mount point %1.</source>
<translation type="unfinished">Для продолжения выберите раздел для точки монтирования %1</translation> <translation>Для продолжения выберите раздел для точки монтирования %1</translation>
</message> </message>
<message> <message>
<source>Adding is not possible. All partitions is busy.</source> <source>Adding is not possible. All partitions is busy.</source>
@ -363,7 +364,7 @@ To modify the mount point, double-click it.</source>
</message> </message>
<message> <message>
<source>Root partition can&apos;t be deleted</source> <source>Root partition can&apos;t be deleted</source>
<translation type="unfinished">Раздел / не может быть удален.</translation> <translation>Раздел / не может быть удален.</translation>
</message> </message>
<message> <message>
<source>Migrated mount point can&apos;t be deleted. Use &apos;none&apos; for disabling migration.</source> <source>Migrated mount point can&apos;t be deleted. Use &apos;none&apos; for disabling migration.</source>
@ -455,11 +456,11 @@ For modifying user - double click it.</source>
</message> </message>
<message> <message>
<source>User guest can&apos;t be deleted.</source> <source>User guest can&apos;t be deleted.</source>
<translation>Пользователь guset не может быть удален.</translation> <translation type="obsolete">Пользователь guset не может быть удален.</translation>
</message> </message>
<message> <message>
<source>User guest can&apos;t be modified.</source> <source>User guest can&apos;t be modified.</source>
<translation>Пользователь guset не может быть изменен.</translation> <translation type="obsolete">Пользователь guset не может быть изменен.</translation>
</message> </message>
<message> <message>
<source>Passwords match</source> <source>Passwords match</source>
@ -471,7 +472,11 @@ For modifying user - double click it.</source>
</message> </message>
<message> <message>
<source>These user accounts will be migrated: </source> <source>These user accounts will be migrated: </source>
<translation type="unfinished">Эти аккаунты будут перенесены: </translation> <translation type="unfinished">Аккаунты этих пользователей будут перенесены: </translation>
</message>
<message>
<source>If the users will not be added, the &apos;guest&apos; user be created automatically.</source>
<translation type="unfinished">Если пользователи не будут добавлены, пользователь &apos;guest&apos; будет создан автоматически.</translation>
</message> </message>
</context> </context>
<context> <context>

31
translations/cl-install-gui_uk.ts
Unescape View File

@ -44,7 +44,7 @@
</message> </message>
<message> <message>
<source>Partition: </source> <source>Partition: </source>
<translation type="unfinished"></translation> <translation type="unfinished">Розділ:</translation>
</message> </message>
<message> <message>
<source>none</source> <source>none</source>
@ -56,7 +56,7 @@
</message> </message>
<message> <message>
<source>Mount point must be not empty</source> <source>Mount point must be not empty</source>
<translation type="unfinished"></translation> <translation type="unfinished">Точка монтування не повинна бути порожньою</translation>
</message> </message>
<message> <message>
<source>Duplicate mount point %1</source> <source>Duplicate mount point %1</source>
@ -339,7 +339,6 @@
</message> </message>
<message> <message>
<source>Information</source> <source>Information</source>
<translatorcomment>Информация</translatorcomment>
<translation>Інформація</translation> <translation>Інформація</translation>
</message> </message>
<message> <message>
@ -368,16 +367,17 @@
</message> </message>
<message> <message>
<source>Add a new mount point</source> <source>Add a new mount point</source>
<translation type="unfinished"></translation> <translation type="unfinished">Додати нову точку монтування</translation>
</message> </message>
<message> <message>
<source>Remove a selected mount point</source> <source>Remove a selected mount point</source>
<translation type="unfinished"></translation> <translation type="unfinished">Видалити обрану точку монтування</translation>
</message> </message>
<message> <message>
<source>Mount <source>Mount
point</source> point</source>
<translation type="unfinished"></translation> <translation type="unfinished">Точка
монтування</translation>
</message> </message>
<message> <message>
<source>File <source>File
@ -388,23 +388,24 @@ system</source>
<message> <message>
<source>Choose mount points for the installation. You need at least a root / partition. <source>Choose mount points for the installation. You need at least a root / partition.
To modify the mount point, double-click it.</source> To modify the mount point, double-click it.</source>
<translation type="unfinished"></translation> <translation type="unfinished">Виберіть точки монтування для встановлення. Мінімально необхідно вибрати розділ для / розділу.
Для редагування створених точок монтування, використовуйте подвійний клік на ній.</translation>
</message> </message>
<message> <message>
<source>To continue You need to choose partition for mount point %1.</source> <source>To continue You need to choose partition for mount point %1.</source>
<translation type="unfinished"></translation> <translation>Для продовження виберіть розділ для точки монтування%1</translation>
</message> </message>
<message> <message>
<source>Adding is not possible. All partitions is busy.</source> <source>Adding is not possible. All partitions is busy.</source>
<translation type="unfinished"></translation> <translation type="unfinished">Додавання не можливо. Всі розділи вже використовуються.</translation>
</message> </message>
<message> <message>
<source>Root partition can&apos;t be deleted</source> <source>Root partition can&apos;t be deleted</source>
<translation type="unfinished"></translation> <translation>Розділ / не може бути видалений.</translation>
</message> </message>
<message> <message>
<source>Migrated mount point can&apos;t be deleted. Use &apos;none&apos; for disabling migration.</source> <source>Migrated mount point can&apos;t be deleted. Use &apos;none&apos; for disabling migration.</source>
<translation type="unfinished"></translation> <translation type="unfinished">Переносима точка монтування не може бути вилучена. Використовуйте &apos;none&apos; в імені розділу для деактивації перенесення цієї точки.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -511,12 +512,12 @@ For modifying user - double click it.</source>
<message> <message>
<source>User guest can&apos;t be deleted.</source> <source>User guest can&apos;t be deleted.</source>
<translatorcomment>Пользователь guset не может быть удален.</translatorcomment> <translatorcomment>Пользователь guset не может быть удален.</translatorcomment>
<translation>Користувач guset не може бути знищено.</translation> <translation type="obsolete">Користувач guset не може бути знищено.</translation>
</message> </message>
<message> <message>
<source>User guest can&apos;t be modified.</source> <source>User guest can&apos;t be modified.</source>
<translatorcomment>Пользователь guset не может быть изменен.</translatorcomment> <translatorcomment>Пользователь guset не может быть изменен.</translatorcomment>
<translation>Користувач guset не може бути змінений.</translation> <translation type="obsolete">Користувач guset не може бути змінений.</translation>
</message> </message>
<message> <message>
<source>Passwords match</source> <source>Passwords match</source>
@ -530,6 +531,10 @@ For modifying user - double click it.</source>
</message> </message>
<message> <message>
<source>These user accounts will be migrated: </source> <source>These user accounts will be migrated: </source>
<translation type="unfinished">Акаунти цих користувачів будуть перенесені:</translation>
</message>
<message>
<source>If the users will not be added, the &apos;guest&apos; user be created automatically.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>

Write Preview
Loading…
Cancel
Save