Fixed PageMountpoints and debug log.

Fixed russian translation.
14 years ago · efeb086ac4
parent 1a86d131e8
commit efeb086ac4
5 changed files with 533 additions and 59 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -68,6 +68,6 @@ void toDebugLog(const QString& str)
 	if (debugLog.isOpen())
 		debugLog.write(
 			("[" + QDateTime::currentDateTime().toString(Qt::ISODate) + "] " +
-			str + "\r").toLocal8Bit()
+			str + "\n\r").toLocal8Bit()
 		);
 }
--- a/src/pagemountpoints.cpp
+++ b/src/pagemountpoints.cpp
@ -194,7 +194,7 @@ void PageMountPoints::showTree()
 void PageMountPoints::showBranch(const QString& dev, const MountPointsList& list)
 {
 	QTreeWidgetItem* trwItem_0 = new QTreeWidgetItem;
-	trwItem_0->setText(0, "/dev/" + dev );
+	trwItem_0->setText(0, dev );
 	trwItem_0->setText(1, "" );
 	trwItem_0->setText(2, "" );
 	trwItem_0->setText(3, "" );
--- a/src/pagewelcome.cpp
+++ b/src/pagewelcome.cpp
@ -83,6 +83,8 @@ void PageWelcome::retranslateUi()
 	}
 	m_comboboxLanguages->setCurrentIndex(selected);

+	m_comboboxLanguages->setToolTip( tr("Please choose the language which should be used for this application.") );
+
 	connect(m_comboboxLanguages, SIGNAL(currentIndexChanged(int)), this, SLOT(changeLanguageIndex(int)));
 }

--- a/translations/cl-install-gui_bg.ts
+++ b/translations/cl-install-gui_bg.ts
@ -5,19 +5,46 @@
    <name>LibParted</name>
    <message>
        <source>B</source>
-        <translation>Б</translation>
+        <translation type="obsolete">Б</translation>
    </message>
    <message>
        <source>KB</source>
-        <translation>КБ</translation>
+        <translation type="obsolete">КБ</translation>
    </message>
    <message>
        <source>MB</source>
-        <translation>МБ</translation>
+        <translation type="obsolete">МБ</translation>
    </message>
    <message>
        <source>GB</source>
-        <translation>ГБ</translation>
+        <translation type="obsolete">ГБ</translation>
+    </message>
+</context>
+<context>
+    <name>MountPointDialog</name>
+    <message>
+        <source>Device: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mount point: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File system: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
@ -59,7 +86,7 @@
    </message>
    <message>
        <source>Installation for assembling</source>
-        <translation type="unfinished">Събиране на информация за инсталацията</translation>
+        <translation type="obsolete">Събиране на информация за инсталацията</translation>
    </message>
    <message>
        <source>Do not prompt before overwriting</source>
@ -67,35 +94,35 @@
    </message>
    <message>
        <source>English</source>
-        <translation type="unfinished">Английски</translation>
+        <translation type="obsolete">Английски</translation>
    </message>
    <message>
        <source>German</source>
-        <translation type="unfinished">Немски</translation>
+        <translation type="obsolete">Немски</translation>
    </message>
    <message>
        <source>Spanish</source>
-        <translation type="unfinished">Испански</translation>
+        <translation type="obsolete">Испански</translation>
    </message>
    <message>
        <source>French</source>
-        <translation type="unfinished">Френски</translation>
+        <translation type="obsolete">Френски</translation>
    </message>
    <message>
        <source>Italian</source>
-        <translation type="unfinished">Италянски</translation>
+        <translation type="obsolete">Италянски</translation>
    </message>
    <message>
        <source>Polish</source>
-        <translation type="unfinished">Полски</translation>
+        <translation type="obsolete">Полски</translation>
    </message>
    <message>
        <source>Brazilian Portugal</source>
-        <translation type="unfinished">Бразилски (Португалски)</translation>
+        <translation type="obsolete">Бразилски (Португалски)</translation>
    </message>
    <message>
        <source>Russian</source>
-        <translation type="unfinished">Руски</translation>
+        <translation type="obsolete">Руски</translation>
    </message>
    <message>
        <source>Format root partition</source>
@ -103,27 +130,27 @@
    </message>
    <message>
        <source>File system:</source>
-        <translation type="unfinished">Файлова Система:</translation>
+        <translation type="obsolete">Файлова Система:</translation>
    </message>
    <message>
        <source>Format root partition before installing</source>
-        <translation type="unfinished">Форматирайте кореновия дял (root) преди инсталиране</translation>
+        <translation type="obsolete">Форматирайте кореновия дял (root) преди инсталиране</translation>
    </message>
    <message>
        <source>Install bootloader to MBR</source>
-        <translation type="unfinished">Инсталиране на bootloader в MBR</translation>
+        <translation type="obsolete">Инсталиране на bootloader в MBR</translation>
    </message>
    <message>
        <source>Use UUID for mounting partitions</source>
-        <translation type="unfinished">Използване на UUID за монтиране на дяловете</translation>
+        <translation type="obsolete">Използване на UUID за монтиране на дяловете</translation>
    </message>
    <message>
        <source>Disk type:</source>
-        <translation type="unfinished">Тип диск:</translation>
+        <translation type="obsolete">Тип диск:</translation>
    </message>
    <message>
        <source>Video resolution</source>
-        <translation type="unfinished">Резолюция на екрана:</translation>
+        <translation type="obsolete">Резолюция на екрана:</translation>
    </message>
    <message>
        <source>Use composite</source>
@ -135,7 +162,7 @@
    </message>
    <message>
        <source>IO sheduler:</source>
-        <translation type="unfinished">Планиране Вход/Изход (IO Sheduler)</translation>
+        <translation type="obsolete">Планиране Вход/Изход (IO Sheduler)</translation>
    </message>
    <message>
        <source>Video driver:</source>
@ -150,6 +177,46 @@
        <translatorcomment>Това е експертен режим за настройка за напреднали</translatorcomment>
        <translation type="unfinished">Допълнителни настройки</translation>
    </message>
+    <message>
+        <source>Domain: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device for install Grub:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Make options (MAKEOPTS):</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Proxy server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>NTP server:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clock type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Local</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>UTC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hostname is empty.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>PageFinish</name>
@ -174,7 +241,7 @@
    </message>
    <message>
        <source>Eta: %1</source>
-        <translation>Eta: %1</translation>
+        <translation type="obsolete">Eta: %1</translation>
    </message>
    <message>
        <source>Eta: 0:00:00</source>
@ -213,6 +280,57 @@ Java 2 (SUN) Runtime Environment, Standard Edition&lt;br&gt;
 &lt;p&gt;&lt;a href=&apos;http://www.calculate-linux.ru&apos;&gt;http://www.calculate-linux.ru&lt;/a&gt;&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>PageMountPoints</name>
+    <message>
+        <source>Mount points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mount point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File system</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished">Файловая система:</translation>
+    </message>
+    <message>
+        <source>Select mount points:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You select auto partitioning. Press &quot;Next&quot; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>YES</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>PagePartitioning</name>
    <message>
@ -225,27 +343,27 @@ Java 2 (SUN) Runtime Environment, Standard Edition&lt;br&gt;
    </message>
    <message>
        <source>Use existing partition</source>
-        <translation type="unfinished">Използване на съществуващ дял</translation>
+        <translation type="obsolete">Използване на съществуващ дял</translation>
    </message>
    <message>
        <source>Use automatical partitioning</source>
-        <translation type="unfinished">Автоматично разделяне на диска (Hard Disk)</translation>
+        <translation type="obsolete">Автоматично разделяне на диска (Hard Disk)</translation>
    </message>
    <message>
        <source>Manualy partitioning</source>
-        <translation type="unfinished">Ръчно разделяне</translation>
+        <translation type="obsolete">Ръчно разделяне</translation>
    </message>
    <message>
        <source>Critical error</source>
-        <translation type="unfinished">Критична грешка</translation>
+        <translation type="obsolete">Критична грешка</translation>
    </message>
    <message>
        <source>Not found any disk for install</source>
-        <translation type="unfinished">Не е наличен Твърд Диск (Hard Disk) за инсталиране</translation>
+        <translation type="obsolete">Не е наличен Твърд Диск (Hard Disk) за инсталиране</translation>
    </message>
    <message>
        <source>Not found any partition for install</source>
-        <translation type="unfinished">Не е наличен дял за инсталиране</translation>
+        <translation type="obsolete">Не е наличен дял за инсталиране</translation>
    </message>
    <message>
        <source>Error</source>
@ -257,7 +375,66 @@ Java 2 (SUN) Runtime Environment, Standard Edition&lt;br&gt;
    </message>
    <message>
        <source>Cannot read partition table from %1</source>
-        <translation type="unfinished">Грешка не може да бъде открита таблицата в %1</translation>
+        <translation type="obsolete">Грешка не може да бъде открита таблицата в %1</translation>
+    </message>
+    <message>
+        <source>Use existing partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use automatically partitioning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manually partitioning</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PageUsers</name>
+    <message>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Root password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create users:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Грешка</translation>
+    </message>
+    <message>
+        <source>User %1 already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User guest can&apos;t be deleted.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User guest can&apos;t be modified.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Passwords match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Passwords do not match</source>
+        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
@ -274,6 +451,10 @@ Java 2 (SUN) Runtime Environment, Standard Edition&lt;br&gt;
        <source>&lt;p&gt;Welcome to Calculate Linux.&lt;/p&gt;&lt;p&gt;&lt;a href=&apos;http://calculate-linux.org&apos;&gt;http://calculate-linux.org&lt;/a&gt;&lt;/p&gt;</source>
        <translation type="unfinished">&lt;p&gt;Добре дошли в Calculate Linux.&lt;/p&gt;&lt;p&gt;&lt;a href=&apos;http://calculate-linux.ru&apos;&gt;http://calculate-linux.ru&lt;/a&gt;&lt;/p&gt;</translation>
    </message>
+    <message>
+        <source>Please choose the language which should be used for this application.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QObject</name>
@ -363,5 +544,60 @@ Java 2 (SUN) Runtime Environment, Standard Edition&lt;br&gt;
        <source>Copy</source>
        <translation type="unfinished">Копиране</translation>
    </message>
+    <message>
+        <source>Critical error</source>
+        <translation type="unfinished">Критична грешка</translation>
+    </message>
+    <message>
+        <source>Failed to launch &apos;cl-install&apos;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoDialog</name>
+    <message>
+        <source>Add user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modify user</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Passwords match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Passwords do not match</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Грешка</translation>
+    </message>
+    <message>
+        <source>User name is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--- a/translations/cl-install-gui_ru.ts
+++ b/translations/cl-install-gui_ru.ts
@ -5,19 +5,46 @@
    <name>LibParted</name>
    <message>
        <source>B</source>
-        <translation>Б</translation>
+        <translation type="obsolete">Б</translation>
    </message>
    <message>
        <source>KB</source>
-        <translation>КБ</translation>
+        <translation type="obsolete">КБ</translation>
    </message>
    <message>
        <source>MB</source>
-        <translation>МБ</translation>
+        <translation type="obsolete">МБ</translation>
    </message>
    <message>
        <source>GB</source>
-        <translation>ГБ</translation>
+        <translation type="obsolete">ГБ</translation>
+    </message>
+</context>
+<context>
+    <name>MountPointDialog</name>
+    <message>
+        <source>Device: </source>
+        <translation type="unfinished">Устройство: </translation>
+    </message>
+    <message>
+        <source>Mount point: </source>
+        <translation type="unfinished">Точка монтирования: </translation>
+    </message>
+    <message>
+        <source>Format partition</source>
+        <translation type="unfinished">Форматировать раздел</translation>
+    </message>
+    <message>
+        <source>File system: </source>
+        <translation type="unfinished">Файловая система:</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished">ОК</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Отмена</translation>
    </message>
 </context>
 <context>
@ -59,7 +86,7 @@
    </message>
    <message>
        <source>Installation for assembling</source>
-        <translation>Установка для сборки</translation>
+        <translation type="obsolete">Установка для сборки</translation>
    </message>
    <message>
        <source>Do not prompt before overwriting</source>
@ -67,35 +94,35 @@
    </message>
    <message>
        <source>English</source>
-        <translation>Английский</translation>
+        <translation type="obsolete">Английский</translation>
    </message>
    <message>
        <source>German</source>
-        <translation>Немецкий</translation>
+        <translation type="obsolete">Немецкий</translation>
    </message>
    <message>
        <source>Spanish</source>
-        <translation>Испанский</translation>
+        <translation type="obsolete">Испанский</translation>
    </message>
    <message>
        <source>French</source>
-        <translation>Французский</translation>
+        <translation type="obsolete">Французский</translation>
    </message>
    <message>
        <source>Italian</source>
-        <translation>Итальянский</translation>
+        <translation type="obsolete">Итальянский</translation>
    </message>
    <message>
        <source>Polish</source>
-        <translation>Польский</translation>
+        <translation type="obsolete">Польский</translation>
    </message>
    <message>
        <source>Brazilian Portugal</source>
-        <translation>Бразильский (португальский)</translation>
+        <translation type="obsolete">Бразильский (португальский)</translation>
    </message>
    <message>
        <source>Russian</source>
-        <translation>Русский</translation>
+        <translation type="obsolete">Русский</translation>
    </message>
    <message>
        <source>Format root partition</source>
@ -103,27 +130,27 @@
    </message>
    <message>
        <source>File system:</source>
-        <translation>Файловая система:</translation>
+        <translation type="obsolete">Файловая система:</translation>
    </message>
    <message>
        <source>Format root partition before installing</source>
-        <translation>Форматировать корневой раздел перед установкой</translation>
+        <translation type="obsolete">Форматировать корневой раздел перед установкой</translation>
    </message>
    <message>
        <source>Install bootloader to MBR</source>
-        <translation>Установить загрузчик в MBR</translation>
+        <translation type="obsolete">Установить загрузчик в MBR</translation>
    </message>
    <message>
        <source>Use UUID for mounting partitions</source>
-        <translation>Использовать UUID для монтирования разделов</translation>
+        <translation type="obsolete">Использовать UUID для монтирования разделов</translation>
    </message>
    <message>
        <source>Disk type:</source>
-        <translation>Тип диска:</translation>
+        <translation type="obsolete">Тип диска:</translation>
    </message>
    <message>
        <source>Video resolution</source>
-        <translation>Разрешение экрана:</translation>
+        <translation type="obsolete">Разрешение экрана:</translation>
    </message>
    <message>
        <source>Use composite</source>
@ -135,7 +162,7 @@
    </message>
    <message>
        <source>IO sheduler:</source>
-        <translation>Планировщик ввода/вывода:</translation>
+        <translation type="obsolete">Планировщик ввода/вывода:</translation>
    </message>
    <message>
        <source>Video driver:</source>
@ -149,6 +176,46 @@
        <source>Expert settings</source>
        <translation>Экспертные настройки: </translation>
    </message>
+    <message>
+        <source>Domain: </source>
+        <translation type="unfinished">Домен: </translation>
+    </message>
+    <message>
+        <source>Device for install Grub:</source>
+        <translation type="unfinished">Устройства для установки Grub: </translation>
+    </message>
+    <message>
+        <source>Make options (MAKEOPTS):</source>
+        <translation type="unfinished">Опции сборки (MAKEOPTS):</translation>
+    </message>
+    <message>
+        <source>Proxy server:</source>
+        <translation type="unfinished">Proxy сервер:</translation>
+    </message>
+    <message>
+        <source>NTP server:</source>
+        <translation type="unfinished">NTP сервер:</translation>
+    </message>
+    <message>
+        <source>Clock type:</source>
+        <translation type="unfinished">Тип часов:</translation>
+    </message>
+    <message>
+        <source>Local</source>
+        <translation type="unfinished">Локальное</translation>
+    </message>
+    <message>
+        <source>UTC</source>
+        <translation type="unfinished">UTC</translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished">Предупреждение</translation>
+    </message>
+    <message>
+        <source>Hostname is empty.</source>
+        <translation type="unfinished">Имя компьютера пустое</translation>
+    </message>
 </context>
 <context>
    <name>PageFinish</name>
@ -158,7 +225,7 @@
    </message>
    <message>
        <source>&lt;h4&gt;Congratulation!&lt;/h4&gt;&lt;p&gt;Installation complete.Press Finish for exit.&lt;/p&gt;</source>
-        <translation>&lt;h4&gt;Поздравляем!&lt;/h4&gt;&lt;p&gt;Установка успешно завершена. Нажмите Завершить для выхода.&lt;/p&gt;</translation>
+        <translation type="unfinished">&lt;h4&gt;Поздравляем!&lt;/h4&gt;&lt;p&gt;Установка успешно завершена. Нажмите &quot;Закончить&quot; для выхода.&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
@ -173,7 +240,7 @@
    </message>
    <message>
        <source>Eta: %1</source>
-        <translation>Eta: %1</translation>
+        <translation type="obsolete">Eta: %1</translation>
    </message>
    <message>
        <source>Eta: 0:00:00</source>
@ -242,6 +309,57 @@ Java 2 (SUN) Runtime Environment, Standard Edition&lt;br&gt;
 &lt;p&gt;&lt;a href=&apos;http://www.calculate-linux.ru&apos;&gt;http://www.calculate-linux.ru&lt;/a&gt;&lt;/p&gt;</translation>
    </message>
 </context>
+<context>
+    <name>PageMountPoints</name>
+    <message>
+        <source>Mount points</source>
+        <translation>Точка монтирования:</translation>
+    </message>
+    <message>
+        <source>Partition</source>
+        <translation type="unfinished">Раздел</translation>
+    </message>
+    <message>
+        <source>Label</source>
+        <translation type="unfinished">Метка</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished">Размер</translation>
+    </message>
+    <message>
+        <source>Mount point</source>
+        <translation type="unfinished">Точка монтирования:</translation>
+    </message>
+    <message>
+        <source>File system</source>
+        <translation type="unfinished">Файловая система</translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select mount points:</source>
+        <translation type="unfinished">Выберите точку монтирования:</translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Информация</translation>
+    </message>
+    <message>
+        <source>You select auto partitioning. Press &quot;Next&quot; to continue.</source>
+        <translation type="unfinished">Вы выбрали автоматическую разметку диска. Нажмите &quot;Вперед&quot; для продолжения.</translation>
+    </message>
+    <message>
+        <source>YES</source>
+        <translation type="unfinished">ДА</translation>
+    </message>
+    <message>
+        <source>no</source>
+        <translation type="unfinished">нет</translation>
+    </message>
+</context>
 <context>
    <name>PagePartitioning</name>
    <message>
@ -254,27 +372,27 @@ Java 2 (SUN) Runtime Environment, Standard Edition&lt;br&gt;
    </message>
    <message>
        <source>Use existing partition</source>
-        <translation>Использовать существующий раздел</translation>
+        <translation type="obsolete">Использовать существующий раздел</translation>
    </message>
    <message>
        <source>Use automatical partitioning</source>
-        <translation>Использовать автоматическую разбивку</translation>
+        <translation type="obsolete">Использовать автоматическую разбивку</translation>
    </message>
    <message>
        <source>Manualy partitioning</source>
-        <translation>Ручная разбивка</translation>
+        <translation type="obsolete">Ручная разбивка</translation>
    </message>
    <message>
        <source>Critical error</source>
-        <translation>Критическая ошибка</translation>
+        <translation type="obsolete">Критическая ошибка</translation>
    </message>
    <message>
        <source>Not found any disk for install</source>
-        <translation>Не найдено ни одного диска для установки</translation>
+        <translation type="obsolete">Не найдено ни одного диска для установки</translation>
    </message>
    <message>
        <source>Not found any partition for install</source>
-        <translation>Не найдено ни одного раздела для установки</translation>
+        <translation type="obsolete">Не найдено ни одного раздела для установки</translation>
    </message>
    <message>
        <source>Error</source>
@ -286,7 +404,66 @@ Java 2 (SUN) Runtime Environment, Standard Edition&lt;br&gt;
    </message>
    <message>
        <source>Cannot read partition table from %1</source>
-        <translation>Ошибка чтения таблицы разделов с %1</translation>
+        <translation type="obsolete">Ошибка чтения таблицы разделов с %1</translation>
+    </message>
+    <message>
+        <source>Use existing partitions</source>
+        <translation type="unfinished">Использовать существующие разделы</translation>
+    </message>
+    <message>
+        <source>Use automatically partitioning</source>
+        <translation type="unfinished">Использовать автоматическую разметку диска</translation>
+    </message>
+    <message>
+        <source>Manually partitioning</source>
+        <translation type="unfinished">Ручная разметка диска</translation>
+    </message>
+</context>
+<context>
+    <name>PageUsers</name>
+    <message>
+        <source>Users</source>
+        <translation type="unfinished">Пользователи</translation>
+    </message>
+    <message>
+        <source>Root password:</source>
+        <translation type="unfinished">Пароль суперпользователя</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Пароль</translation>
+    </message>
+    <message>
+        <source>Confirm Password</source>
+        <translation type="unfinished">Подтверждение пароля</translation>
+    </message>
+    <message>
+        <source>Create users:</source>
+        <translation type="unfinished">Создать пользователей:</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Ошибка</translation>
+    </message>
+    <message>
+        <source>User %1 already exists.</source>
+        <translation type="unfinished">Пользователь %1 уже существует.</translation>
+    </message>
+    <message>
+        <source>User guest can&apos;t be deleted.</source>
+        <translation type="unfinished">Пользователь guest не может быть удален.</translation>
+    </message>
+    <message>
+        <source>User guest can&apos;t be modified.</source>
+        <translation type="unfinished">Пользователь guest не может быть изменен.</translation>
+    </message>
+    <message>
+        <source>Passwords match</source>
+        <translation type="unfinished">Пароли совпадают</translation>
+    </message>
+    <message>
+        <source>Passwords do not match</source>
+        <translation type="unfinished">Пароли не совпадают</translation>
    </message>
 </context>
 <context>
@ -303,6 +480,10 @@ Java 2 (SUN) Runtime Environment, Standard Edition&lt;br&gt;
        <source>&lt;p&gt;Welcome to Calculate Linux.&lt;/p&gt;&lt;p&gt;&lt;a href=&apos;http://calculate-linux.org&apos;&gt;http://calculate-linux.org&lt;/a&gt;&lt;/p&gt;</source>
        <translation>&lt;p&gt;Добро пожаловать в Calculate Linux.&lt;/p&gt;&lt;p&gt;&lt;a href=&apos;http://calculate-linux.ru&apos;&gt;http://calculate-linux.ru&lt;/a&gt;&lt;/p&gt;</translation>
    </message>
+    <message>
+        <source>Please choose the language which should be used for this application.</source>
+        <translation type="unfinished">Пожалуйста, выберите язык, который будет использоваться этим приложением.</translation>
+    </message>
 </context>
 <context>
    <name>QObject</name>
@ -392,5 +573,60 @@ Java 2 (SUN) Runtime Environment, Standard Edition&lt;br&gt;
        <source>Copy</source>
        <translation>Копировать</translation>
    </message>
+    <message>
+        <source>Critical error</source>
+        <translation type="unfinished">Критическая ошибка</translation>
+    </message>
+    <message>
+        <source>Failed to launch &apos;cl-install&apos;.</source>
+        <translation type="unfinished">Не могу запустить &apos;cl-install&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>UserInfoDialog</name>
+    <message>
+        <source>Add user</source>
+        <translation type="unfinished">Добавить пользователя</translation>
+    </message>
+    <message>
+        <source>Modify user</source>
+        <translation type="unfinished">Изменить пользователя</translation>
+    </message>
+    <message>
+        <source>User name:</source>
+        <translation type="unfinished">Имя пользователя:</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Пароль</translation>
+    </message>
+    <message>
+        <source>Confirm Password</source>
+        <translation type="unfinished">Подтверждение пароля</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished">ОК</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished">Отмена</translation>
+    </message>
+    <message>
+        <source>Passwords match</source>
+        <translation type="unfinished">Пароли совпадают</translation>
+    </message>
+    <message>
+        <source>Passwords do not match</source>
+        <translation type="unfinished">Пароли не совпадают</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Ошибка</translation>
+    </message>
+    <message>
+        <source>User name is empty</source>
+        <translation type="unfinished">Имя пользователя не задано</translation>
+    </message>
 </context>
 </TS>