[PC-BSD Commits] r5188 - in pcbsd/trunk/SysInstaller: . i18n

svn at pcbsd.org svn at pcbsd.org
Wed Dec 2 07:36:24 PST 2009


Author: kris
Date: 2009-12-02 07:36:24 -0800 (Wed, 02 Dec 2009)
New Revision: 5188

Added:
   pcbsd/trunk/SysInstaller/sys-installwidget.cpp
Modified:
   pcbsd/trunk/SysInstaller/SysInstaller.pro
   pcbsd/trunk/SysInstaller/backend.h
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_af.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_ar.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_az.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_bg.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_bn.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_bs.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_ca.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_cs.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_cy.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_da.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_de.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_el.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_GB.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_ZA.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_es.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_et.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_eu.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_fa.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_fi.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_fr.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_fur.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_gl.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_he.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_hi.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_hr.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_hu.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_id.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_is.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_it.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_ja.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_ka.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_ko.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_lt.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_lv.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_mk.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_mn.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_ms.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_mt.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_nb.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_ne.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_nl.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_pa.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_pl.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_pt.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_pt_BR.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_ro.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_ru.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_sk.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_sl.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_sr.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_sv.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_ta.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_tg.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_th.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_tr.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_uk.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_uz.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_vi.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_CN.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_HK.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_TW.ts
   pcbsd/trunk/SysInstaller/i18n/SysInstaller_zu.ts
   pcbsd/trunk/SysInstaller/main.cpp
   pcbsd/trunk/SysInstaller/sysinstaller.cpp
   pcbsd/trunk/SysInstaller/sysinstaller.h
Log:

Updated SysInstall, i18n works now, you can switch between languages and the installer reloads with the new strings



Modified: pcbsd/trunk/SysInstaller/SysInstaller.pro
===================================================================
--- pcbsd/trunk/SysInstaller/SysInstaller.pro	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/SysInstaller.pro	2009-12-02 15:36:24 UTC (rev 5188)
@@ -9,6 +9,7 @@
 SOURCES += main.cpp \
     sys-componentwidget.cpp \
     sys-diskwidget.cpp \
+    sys-installwidget.cpp \
     sys-keyboardwidget.cpp \
     sys-userwidget.cpp \
     dialogFileSystem.cpp \

Modified: pcbsd/trunk/SysInstaller/backend.h
===================================================================
--- pcbsd/trunk/SysInstaller/backend.h	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/backend.h	2009-12-02 15:36:24 UTC (rev 5188)
@@ -11,6 +11,8 @@
 
 #define PCSYSINSTALL    QString("/pc-sysinstall/pc-sysinstall")
 #define PCSYSINSTALLDIR QString("/pc-sysinstall")
+#define PCSYSINSTALLCFG QString("/tmp/sys-install.cfg")
+#define TMPLANGFILE QString("/tmp/.SysInstallLang")
 
 // Set the minimum sizes for FBSD
 #define FBSD_MINSIZE 4000

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_af.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_af.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_af.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ar.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ar.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ar.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_az.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_az.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_az.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_bg.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_bg.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_bg.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_bn.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_bn.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_bn.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_bs.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_bs.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_bs.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ca.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ca.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ca.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_cs.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_cs.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_cs.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_cy.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_cy.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_cy.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_da.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_da.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_da.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_de.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_de.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_de.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_el.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_el.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_el.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_GB.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_GB.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_GB.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_ZA.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_ZA.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_ZA.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_es.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_es.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_es.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_et.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_et.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_et.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_eu.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_eu.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_eu.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_fa.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_fa.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_fa.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="43"/>
-        <source>Post-Install Summary</source>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Configuration Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="159"/>
+        <location filename="../sysinstaller.cpp" line="155"/>
+        <location filename="../sysinstaller.cpp" line="374"/>
+        <source>AUTO-DHCP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="219"/>
+        <source>Invalid Upgrade Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="220"/>
+        <source>No upgrade partition has been selected!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="403"/>
+        <source>The system will be installed with the following options:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="421"/>
+        <source>Performing a system restore from:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="442"/>
+        <source>Performing a system upgrade of PC-BSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="446"/>
+        <source>Performing a system upgrade of FreeBSD on:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="454"/>
+        <source>Performing a fresh install of PC-BSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="458"/>
+        <source>Performing a fresh install of FreeBSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="471"/>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>Installing From:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="498"/>
+        <source>DVD/USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="286"/>
+        <location filename="../sysinstaller.cpp" line="319"/>
         <source>PC-BSD Installer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="160"/>
+        <location filename="../sysinstaller.cpp" line="287"/>
+        <source>Start the installation now?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="320"/>
         <source>Are you sure you want to abort this installation?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -119,8 +217,6 @@
     <message>
         <location filename="../sysinstaller.ui" line="96"/>
         <location filename="../sysinstaller.ui" line="156"/>
-        <location filename="../sysinstaller.ui" line="1134"/>
-        <location filename="../sysinstaller.ui" line="1144"/>
         <source>TextLabel</source>
         <translation type="unfinished"></translation>
     </message>
@@ -142,31 +238,36 @@
     <message>
         <location filename="../sysinstaller.ui" line="275"/>
         <location filename="../sysinstaller.ui" line="287"/>
-        <location filename="../sysinstaller.ui" line="1500"/>
-        <location filename="../sysinstaller.ui" line="1516"/>
-        <location filename="../sysinstaller.ui" line="1532"/>
+        <location filename="../sysinstaller.ui" line="2752"/>
+        <location filename="../sysinstaller.ui" line="2768"/>
+        <location filename="../sysinstaller.ui" line="2784"/>
         <source>background-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="343"/>
+        <location filename="../sysinstaller.ui" line="319"/>
+        <source>Language Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="348"/>
         <source>background-color: rgb(250, 250, 250);
 color: rgb(79, 79, 79);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="375"/>
+        <location filename="../sysinstaller.ui" line="394"/>
         <source>color: rgb(116, 160, 180);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="379"/>
+        <location filename="../sysinstaller.ui" line="398"/>
         <source>Welcome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="395"/>
+        <location filename="../sysinstaller.ui" line="414"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -175,167 +276,645 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="464"/>
-        <location filename="../sysinstaller.ui" line="525"/>
-        <location filename="../sysinstaller.ui" line="1416"/>
+        <location filename="../sysinstaller.ui" line="485"/>
+        <source>Keyboard Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="589"/>
+        <location filename="../sysinstaller.ui" line="618"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);
 background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="501"/>
-        <location filename="../sysinstaller.ui" line="562"/>
-        <location filename="../sysinstaller.ui" line="989"/>
-        <location filename="../sysinstaller.ui" line="1175"/>
-        <location filename="../sysinstaller.ui" line="1403"/>
+        <location filename="../sysinstaller.ui" line="316"/>
+        <location filename="../sysinstaller.ui" line="482"/>
+        <location filename="../sysinstaller.ui" line="520"/>
+        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="1562"/>
+        <location filename="../sysinstaller.ui" line="2228"/>
+        <location filename="../sysinstaller.ui" line="2347"/>
+        <location filename="../sysinstaller.ui" line="2450"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="504"/>
-        <location filename="../sysinstaller.ui" line="1406"/>
+        <location filename="../sysinstaller.ui" line="523"/>
         <source>Preferred Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="565"/>
+        <location filename="../sysinstaller.ui" line="568"/>
         <source>Preferred Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="622"/>
+        <location filename="../sysinstaller.ui" line="686"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
 color: rgb(116, 160, 180);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="626"/>
+        <location filename="../sysinstaller.ui" line="690"/>
         <source>( you may type into the space below to test your selected settings. )</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="658"/>
+        <location filename="../sysinstaller.ui" line="447"/>
         <source>Use Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="690"/>
-        <location filename="../sysinstaller.ui" line="875"/>
-        <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));
-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../sysinstaller.ui" line="738"/>
+        <location filename="../sysinstaller.ui" line="776"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="771"/>
+        <location filename="../sysinstaller.ui" line="809"/>
         <source>Upgrade</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="803"/>
+        <location filename="../sysinstaller.ui" line="841"/>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="942"/>
-        <location filename="../sysinstaller.ui" line="1187"/>
-        <location filename="../sysinstaller.ui" line="1204"/>
-        <location filename="../sysinstaller.ui" line="1221"/>
-        <location filename="../sysinstaller.ui" line="1245"/>
-        <source>background-color: rgb(250, 250, 250);</source>
+        <location filename="../sysinstaller.ui" line="940"/>
+        <source>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="946"/>
-        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <location filename="../sysinstaller.ui" line="950"/>
+        <source>PC-BSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1026"/>
-        <source>Use Entire Disk</source>
+        <location filename="../sysinstaller.ui" line="970"/>
+        <source>FreeBSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1045"/>
-        <source>Customize Slices</source>
+        <location filename="../sysinstaller.ui" line="1041"/>
+        <source>System Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../sysinstaller.ui" line="1061"/>
+        <source>Available Partitions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1091"/>
+        <source>Life Preserver Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../sysinstaller.ui" line="1104"/>
-        <source>color: rgb(116, 160, 180);</source>
+        <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1094"/>
-        <source>Disk Setup Preview</source>
+        <location filename="../sysinstaller.ui" line="1114"/>
+        <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1248"/>
+        <location filename="../sysinstaller.ui" line="1124"/>
+        <source>Port</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1193"/>
+        <source>Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1203"/>
+        <source>DVD / USB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1217"/>
+        <source>Network / Internet</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1238"/>
+        <source>Network Inferface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1245"/>
+        <source>IP Address</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1252"/>
+        <location filename="../sysinstaller.ui" line="1269"/>
+        <location filename="../sysinstaller.ui" line="1286"/>
+        <location filename="../sysinstaller.ui" line="1303"/>
+        <source>000.000.000.000; </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1262"/>
+        <source>Netmask</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1279"/>
+        <source>Nameserver (DNS)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1296"/>
+        <source>Gateway</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1385"/>
+        <location filename="../sysinstaller.ui" line="1574"/>
+        <location filename="../sysinstaller.ui" line="1591"/>
+        <location filename="../sysinstaller.ui" line="1608"/>
+        <location filename="../sysinstaller.ui" line="1632"/>
+        <source>background-color: rgb(250, 250, 250);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1389"/>
+        <source>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1469"/>
+        <source>Auto Partition</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1488"/>
+        <source>Customize Disk Setup (Advanced)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1527"/>
+        <source>Use Entire Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1635"/>
         <source>Auto Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1277"/>
+        <location filename="../sysinstaller.ui" line="1664"/>
         <source>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
 selection-color: rgb(255, 255, 255);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1288"/>
+        <location filename="../sysinstaller.ui" line="1675"/>
+        <source>ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1680"/>
         <source>Slice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1293"/>
+        <location filename="../sysinstaller.ui" line="1685"/>
         <source>Mount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1298"/>
+        <location filename="../sysinstaller.ui" line="1690"/>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1303"/>
+        <location filename="../sysinstaller.ui" line="1695"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1339"/>
+        <location filename="../sysinstaller.ui" line="1731"/>
         <source>color: rgb(190, 0, 0);</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1342"/>
+        <location filename="../sysinstaller.ui" line="1734"/>
         <source>Install PC-BSD bootloader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1466"/>
+        <location filename="../sysinstaller.ui" line="1828"/>
+        <source>Auto-login User (The first user listed will be logged on automatically)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1851"/>
+        <source>Administrator Password (root)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1857"/>
+        <location filename="../sysinstaller.ui" line="1938"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1877"/>
+        <location filename="../sysinstaller.ui" line="1958"/>
+        <source>Verify password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1900"/>
+        <source>Add User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1906"/>
+        <source>Username:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1922"/>
+        <source>Full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1978"/>
+        <source>Shell:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="1997"/>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2020"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2034"/>
+        <source>User Accounts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2043"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2063"/>
+        <source>color: rgb(167, 0, 0);</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2119"/>
+        <source>Time and Date Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2125"/>
+        <source>Local TimeZone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2138"/>
+        <source>Automatic syncronization with internet Time Servers (NTP)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2231"/>
+        <source>Available Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2350"/>
+        <source>Selected Components</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2453"/>
+        <source>Installation Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2486"/>
+        <source>Please check the summary above, and click &apos;back&apos; to make any corrections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2548"/>
+        <source>Your system is now being installed! This process may take a while, depending upon the installation options chosen, and system speed. You will be notified when the installation is finished.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2647"/>
+        <source>Installation Complete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2653"/>
+        <source>The installation is now complete! You may now remove any boot media, and reboot the system to finish.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.ui" line="2718"/>
         <source>background-color: qlineargradient(spread:pad, x1:0.5, y1:0.2, x2:0.5, y2:1, stop:0 rgba(116, 160, 180, 255), stop:1 rgba(255, 255, 255, 255));</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1503"/>
+        <location filename="../sysinstaller.ui" line="2755"/>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1519"/>
+        <location filename="../sysinstaller.ui" line="2771"/>
         <source>Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.ui" line="1535"/>
+        <location filename="../sysinstaller.ui" line="2787"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../sys-componentwidget.cpp" line="84"/>
+        <source>Selected Components:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="77"/>
+        <location filename="../sys-diskwidget.cpp" line="118"/>
+        <location filename="../sys-diskwidget.cpp" line="124"/>
+        <location filename="../sys-diskwidget.cpp" line="141"/>
+        <location filename="../sys-diskwidget.cpp" line="147"/>
+        <location filename="../sys-diskwidget.cpp" line="153"/>
+        <source>PC-BSD Installer Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="78"/>
+        <source>This install requires a disk/slice with at least</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="79"/>
+        <source>of disk space.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="119"/>
+        <source>Missing &apos;/&apos; file-system, please add a file-system for mount-point &apos;/&apos; to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="125"/>
+        <source>Missing SWAP file-system, please add a SWAP file-system to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="142"/>
+        <location filename="../sys-diskwidget.cpp" line="148"/>
+        <location filename="../sys-diskwidget.cpp" line="154"/>
+        <source>file-system is below the required minimum:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="401"/>
+        <source>The disk will be setup with the following configuration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Disk:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="423"/>
+        <source>Mirroring:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="451"/>
+        <location filename="../sys-diskwidget.cpp" line="472"/>
+        <location filename="../sys-diskwidget.cpp" line="492"/>
+        <source>Partition:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="452"/>
+        <location filename="../sys-diskwidget.cpp" line="473"/>
+        <location filename="../sys-diskwidget.cpp" line="493"/>
+        <source>FileSystem:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="453"/>
+        <location filename="../sys-diskwidget.cpp" line="474"/>
+        <location filename="../sys-diskwidget.cpp" line="494"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-diskwidget.cpp" line="454"/>
+        <location filename="../sys-diskwidget.cpp" line="495"/>
+        <source>Mount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="72"/>
+        <source>Root passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="78"/>
+        <source>Error: User passwords do not match!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="82"/>
+        <source>Username may contain only letters and numbers!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>Error: The username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="115"/>
+        <source>is reserved.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="240"/>
+        <source>You must setup at least one username to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="246"/>
+        <source>Error: Root password must be set to continue. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sys-userwidget.cpp" line="269"/>
+        <source>The following users will be created:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
+<context>
+    <name>dialogFileSystem</name>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="408"/>
+        <source>Error: Invalid Mount Point.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="418"/>
+        <source>Error: A partition with this mount-point already exists.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="428"/>
+        <source>Error: This partition already has a valid swap.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="445"/>
+        <source>Error: No more available partitions for this disk/slice.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.cpp" line="455"/>
+        <source>Error: Drive cannot mirror itself.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="17"/>
+        <source>File System</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="23"/>
+        <source>Disk / Slice</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="33"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="52"/>
+        <source>Mount Point:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="72"/>
+        <source>Size:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="102"/>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="114"/>
+        <source>Enable Encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="145"/>
+        <source>Disk to Mirror</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="155"/>
+        <source>Mirror Method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="197"/>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogFileSystem.ui" line="217"/>
+        <source>&amp;Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>dialogSelectNetServer</name>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="44"/>
+        <source>Enabling Networking... Please Wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.cpp" line="63"/>
+        <source>Selected backup:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="17"/>
+        <source>Select Installation Source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="25"/>
+        <source>Install from Internet </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="53"/>
+        <source>Install from specified server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="60"/>
+        <source>Local Network Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="68"/>
+        <source>Enter the server name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="76"/>
+        <source>FTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="81"/>
+        <source>HTTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="94"/>
+        <source>Enter the directory path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="109"/>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../dialogSelectNet.ui" line="116"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>

Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_fi.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_fi.ts	2009-12-02 13:59:20 UTC (rev 5187)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_fi.ts	2009-12-02 15:36:24 UTC (rev 5188)
@@ -5,99 +5,197 @@
     <name>SysInstaller</name>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="31"/>
+        <location filename="../sysinstaller.cpp" line="44"/>
         <source>Welcome &amp; Language selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="32"/>
-        <location filename="../sysinstaller.cpp" line="42"/>
+        <location filename="../sysinstaller.cpp" line="45"/>
         <source>Keyboard setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Install Selection</source>
+        <source>Select installation type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="33"/>
-        <source>Select installation type</source>
+        <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk Selection</source>
+        <source>Disk setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="34"/>
-        <source>Disk setup</source>
+        <source>Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>Users</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="47"/>
+        <source>User Creation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="36"/>
+        <source>Date &amp; Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="35"/>
+        <location filename="../sysinstaller.cpp" line="37"/>
         <source>Optional components</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
-        <location filename="../sysinstaller.cpp" line="43"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="36"/>
+        <location filename="../sysinstaller.cpp" line="38"/>
         <source>Pre-Install Summary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="37"/>
+        <location filename="../sysinstaller.cpp" line="39"/>
+        <location filename="../sysinstaller.ui" line="2536"/>
         <source>Installation Progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <location filename="../sysinstaller.cpp" line="48"/>
+        <source>Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="40"/>
+        <source>Installation Finished</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time Setup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../sysinstaller.cpp" line="41"/>
+        <location filename="../sysinstaller.cpp" line="46"/>
         <source>Time and Region setup</source>
         <translation type="unfinished"></translation>