[PC-BSD Commits] r5191 - in pcbsd/trunk/SysInstaller: . i18n
svn at pcbsd.org
svn at pcbsd.org
Wed Dec 2 09:24:49 PST 2009
Author: kris
Date: 2009-12-02 09:24:48 -0800 (Wed, 02 Dec 2009)
New Revision: 5191
Modified:
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/sys-installwidget.cpp
pcbsd/trunk/SysInstaller/sysinstaller.cpp
pcbsd/trunk/SysInstaller/sysinstaller.h
Log:
Updated SysInstaller, now the install process works, and finished up properly. We are ready to start implementing it
in the alphas, and begin testing of installs using it!!! :)
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_af.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_af.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_af.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ar.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ar.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ar.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_az.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_az.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_az.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_bg.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_bg.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_bg.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_bn.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_bn.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_bn.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_bs.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_bs.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_bs.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ca.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ca.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ca.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_cs.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_cs.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_cs.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_cy.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_cy.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_cy.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_da.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_da.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_da.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_de.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_de.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_de.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_el.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_el.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_el.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_GB.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_GB.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_GB.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_ZA.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_ZA.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_en_ZA.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_es.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_es.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_es.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_et.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_et.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_et.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_eu.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_eu.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_eu.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_fa.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_fa.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_fa.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_fi.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_fi.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_fi.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_fr.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_fr.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_fr.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_fur.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_fur.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_fur.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_gl.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_gl.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_gl.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_he.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_he.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_he.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_hi.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_hi.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_hi.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_hr.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_hr.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_hr.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_hu.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_hu.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_hu.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_id.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_id.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_id.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_is.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_is.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_is.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_it.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_it.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_it.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ja.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ja.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ja.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ka.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ka.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ka.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ko.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ko.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ko.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_lt.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_lt.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_lt.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_lv.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_lv.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_lv.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_mk.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_mk.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_mk.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_mn.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_mn.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_mn.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ms.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ms.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ms.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_mt.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_mt.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_mt.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_nb.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_nb.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_nb.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ne.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ne.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ne.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_nl.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_nl.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_nl.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_pa.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_pa.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_pa.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_pl.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_pl.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_pl.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_pt.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_pt.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_pt.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_pt_BR.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_pt_BR.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_pt_BR.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ro.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ro.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ro.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ru.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ru.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ru.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_sk.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_sk.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_sk.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_sl.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_sl.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_sl.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_sr.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_sr.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_sr.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_sv.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_sv.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_sv.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_ta.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_ta.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_ta.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_tg.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_tg.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_tg.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_th.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_th.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_th.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_tr.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_tr.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_tr.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_uk.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_uk.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_uk.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_uz.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_uz.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_uz.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_vi.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_vi.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_vi.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_CN.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_CN.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_CN.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_HK.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_HK.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_HK.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_TW.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_TW.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_zh_TW.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/i18n/SysInstaller_zu.ts
===================================================================
--- pcbsd/trunk/SysInstaller/i18n/SysInstaller_zu.ts 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/i18n/SysInstaller_zu.ts 2009-12-02 17:24:48 UTC (rev 5191)
@@ -128,7 +128,7 @@
</message>
<message>
<location filename="../sysinstaller.cpp" line="155"/>
- <location filename="../sysinstaller.cpp" line="374"/>
+ <location filename="../sysinstaller.cpp" line="410"/>
<source>AUTO-DHCP</source>
<translation type="unfinished"></translation>
</message>
@@ -143,59 +143,75 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="403"/>
+ <location filename="../sysinstaller.cpp" line="439"/>
<source>The system will be installed with the following options:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="421"/>
+ <location filename="../sysinstaller.cpp" line="457"/>
<source>Performing a system restore from:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="442"/>
+ <location filename="../sysinstaller.cpp" line="478"/>
<source>Performing a system upgrade of PC-BSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="446"/>
+ <location filename="../sysinstaller.cpp" line="482"/>
<source>Performing a system upgrade of FreeBSD on:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="454"/>
+ <location filename="../sysinstaller.cpp" line="490"/>
<source>Performing a fresh install of PC-BSD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="458"/>
+ <location filename="../sysinstaller.cpp" line="494"/>
<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"/>
+ <location filename="../sysinstaller.cpp" line="507"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>Installing From:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="498"/>
+ <location filename="../sysinstaller.cpp" line="534"/>
<source>DVD/USB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="286"/>
- <location filename="../sysinstaller.cpp" line="319"/>
+ <location filename="../sys-installwidget.cpp" line="33"/>
+ <location filename="../sysinstaller.cpp" line="292"/>
+ <location filename="../sysinstaller.cpp" line="325"/>
<source>PC-BSD Installer</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="287"/>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>The install failed with error:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="34"/>
+ <source>Reboot the system now?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sys-installwidget.cpp" line="49"/>
+ <source>Finish</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../sysinstaller.cpp" line="293"/>
<source>Start the installation now?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../sysinstaller.cpp" line="320"/>
+ <location filename="../sysinstaller.cpp" line="326"/>
<source>Are you sure you want to abort this installation?</source>
<translation type="unfinished"></translation>
</message>
Modified: pcbsd/trunk/SysInstaller/sys-installwidget.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sys-installwidget.cpp 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/sys-installwidget.cpp 2009-12-02 17:24:48 UTC (rev 5191)
@@ -1,9 +1,88 @@
#include "sysinstaller.h"
+#include <QProcess>
// Function which begins the backend install, and connects slots to monitor it
void SysInstaller::startInstall()
{
- // connect(comboDiskList,SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangedDisk()));
+ // Disable the back / next buttons until we are finished
+ nextButton->setEnabled(false);
+ backButton->setEnabled(false);
+ progressBarInstall->setValue(0);
+ installFoundCounter = false;
+ // Start our process to begin the install
+ QString program = PCSYSINSTALL;
+ QStringList arguments;
+ arguments << "-c" << PCSYSINSTALLCFG;
+
+ installProc = new QProcess();
+ installProc->setProcessChannelMode(QProcess::MergedChannels);
+ connect(installProc,SIGNAL(finished( int, QProcess::ExitStatus)),this,SLOT(slotInstallProcFinished( int, QProcess::ExitStatus)));
+ connect(installProc,SIGNAL(readyRead()),this,SLOT(slotReadInstallerOutput()));
+ installProc->start(program, arguments);
+
}
+
+// Slot which is called when the installation has finished
+void SysInstaller::slotInstallProcFinished( int exitCode, QProcess::ExitStatus status)
+{
+ QString tmp;
+ if ( status != QProcess::NormalExit || exitCode != 0 )
+ {
+ int ret = QMessageBox::critical(this, tr("PC-BSD Installer"),
+ tr("The install failed with error:") + tmp.setNum(exitCode) + " " + tr("Reboot the system now?"),
+ QMessageBox::No | QMessageBox::Yes,
+ QMessageBox::No);
+ switch (ret) {
+ case QMessageBox::Yes:
+ //exit the installer :(
+ close();
+ break;
+ case QMessageBox::No: // :)
+ break;
+ }
+ } else {
+ // Move to the final page, and show a finish button
+ proceed(true);
+ nextButton->setEnabled(true);
+ nextButton->setText(tr("Finish"));
+ nextButton->disconnect();
+ connect(nextButton, SIGNAL(clicked()), this, SLOT(slotFinished()));
+ backButton->setEnabled(false);
+ abortButton->setEnabled(false);
+ }
+}
+
+// Slot which reads the output of the installer
+void SysInstaller::slotReadInstallerOutput()
+{
+ QString tmp;
+ int range;
+ bool ok;
+ while ( installProc->canReadLine() )
+ {
+ tmp = installProc->readLine();
+
+ // Watch for our COUNT value
+ if ( ! installFoundCounter )
+ {
+ if ( tmp.indexOf("INSTALLCOUNT: ") != -1 ) {
+ tmp = tmp.remove(0, tmp.indexOf(":") + 1 );
+ tmp = tmp.simplified();
+ range = tmp.toInt(&ok);
+ if ( ok ) {
+ progressBarInstall->setRange(0, range);
+ installFoundCounter = true;
+ }
+ } else {
+ labelInstallStatus->setText(tmp);
+ }
+ } else {
+ // We have found a valid count for this install
+ progressBarInstall->setValue(progressBarInstall->value() + 1);
+ labelInstallStatus->setText(tmp);
+ }
+
+ } // end of while loop
+}
Modified: pcbsd/trunk/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.cpp 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/sysinstaller.cpp 2009-12-02 17:24:48 UTC (rev 5191)
@@ -227,6 +227,12 @@
return false;
}
+// Slot which is called when the Finish button is clicked
+void SysInstaller::slotFinished()
+{
+ close();
+}
+
void SysInstaller::slotNext()
{
QString tmp;
Modified: pcbsd/trunk/SysInstaller/sysinstaller.h
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.h 2009-12-02 17:23:40 UTC (rev 5190)
+++ pcbsd/trunk/SysInstaller/sysinstaller.h 2009-12-02 17:24:48 UTC (rev 5191)
@@ -64,6 +64,7 @@
void slotNext();
void slotBack();
void slotAbort();
+ void slotFinished();
void slotChangeLanguage();
@@ -108,6 +109,10 @@
void slotRemoveUserButton();
void slotApplyUserButton();
+ // Slots for the installation
+ void slotInstallProcFinished( int exitCode, QProcess::ExitStatus status);
+ void slotReadInstallerOutput();
+
private:
void initSteps();
void initAnteInstall();
@@ -167,6 +172,7 @@
QStringList languages;
QStringList updatePartitions;
QProcess *installProc;
+ bool installFoundCounter;
};
More information about the Commits
mailing list