[PC-BSD Commits] r4723 - pcbsd/trunk/SoftwareManager/i18n

svn at pcbsd.org svn at pcbsd.org
Thu Oct 22 11:12:18 PDT 2009


Author: autotrans
Date: 2009-10-22 11:12:18 -0700 (Thu, 22 Oct 2009)
New Revision: 4723

Modified:
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_af.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ar.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_az.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bg.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bn.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bs.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ca.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_cs.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_cy.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_da.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_de.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_el.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_es.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_et.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_eu.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fa.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fi.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fr.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fur.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_gl.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_he.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hi.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hr.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hu.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_id.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_is.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_it.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ja.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ka.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ko.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_lt.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_lv.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_mk.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_mn.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ms.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_mt.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_nb.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ne.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_nl.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_pa.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_pl.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_pt.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_pt_BR.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ro.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ru.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_sk.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_sl.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_sr.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_sv.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ta.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_tg.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_th.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_tr.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_uk.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_uz.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_vi.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_zh_CN.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_zh_HK.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_zh_TW.ts
   pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_zu.ts
Log:
Auto-Commit of i18n data from Pootle for SoftwareManager


Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_af.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_af.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_af.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ar.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ar.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ar.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_az.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_az.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_az.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bg.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bg.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bg.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bn.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bn.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bn.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bs.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bs.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_bs.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ca.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ca.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_ca.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_cs.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_cs.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_cs.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_cy.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_cy.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_cy.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_da.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_da.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_da.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_de.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_de.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_de.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_el.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_el.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_el.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_es.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_es.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_es.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_et.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_et.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_et.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_eu.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_eu.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_eu.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fa.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fa.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fa.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fi.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fi.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fi.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fr.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fr.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fr.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fur.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fur.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_fur.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_gl.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_gl.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_gl.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_he.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_he.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_he.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hi.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hi.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hi.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hr.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hr.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hr.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for any proxy changes to take effect!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="14"/>
         <source>PC-BSD Software and Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="28"/>
         <source>Software Browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="36"/>
-        <location filename="../softmanager-main.ui" line="56"/>
-        <location filename="../softmanager-main.ui" line="76"/>
-        <location filename="../softmanager-main.ui" line="96"/>
-        <location filename="../softmanager-main.ui" line="116"/>
         <source>...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="152"/>
         <source>about:blank</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="175"/>
-        <location filename="../softmanager-main.ui" line="216"/>
         <source>Installed Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="256"/>
         <source>Program Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="261"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="271"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="300"/>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="303"/>
         <source>Alt+R</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="315"/>
         <source>System Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="329"/>
-        <location filename="../softmanager-sysupdate.cpp" line="101"/>
         <source>The following system updates are available:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="358"/>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="365"/>
         <source>View Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="372"/>
         <source>Show ignored updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="414"/>
         <source>Install selected updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="439"/>
         <source>Check for Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="461"/>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.ui" line="491"/>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="99"/>
         <source>Checking for Updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="278"/>
         <source>Pending Upgrade</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Update Manager</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="288"/>
         <source>No software selected to update!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="342"/>
         <source>Starting Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="385"/>
         <source>Download failed! Please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="399"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="401"/>
         <source>Download failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="403"/>
-        <location filename="../softmanager-sysupdate.cpp" line="681"/>
         <source>Downloading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="486"/>
         <source>Upgrading...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="508"/>
         <source>Installing...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Online Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="557"/>
         <source>The updated version of</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="558"/>
         <source>failed the integrity check! Please try updating this PBI again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="560"/>
         <source>An error occured while upgrading</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="561"/>
         <source>You may need to re-install this PBI manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="564"/>
         <source>Upgrade complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="570"/>
-        <location filename="../softmanager-sysupdate.cpp" line="858"/>
         <source>Install complete!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source>Downloading: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="631"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="643"/>
         <source>Uninstall</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="649"/>
         <source>Install Desktop Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="655"/>
         <source>Retry Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-pbiupdate.cpp" line="675"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="723"/>
-        <location filename="../softmanager-pbiupdate.cpp" line="796"/>
         <source>Pending Download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="27"/>
         <source>Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="29"/>
-        <location filename="../softmanager-sysupdate.cpp" line="35"/>
         <source>View update details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="33"/>
         <source>Un-Ignore this update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="53"/>
         <source>No updates are currently being ignored</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="55"/>
         <source>The system is fully updated!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="85"/>
         <source>The following system updates are being ignored:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
         <source>Error parsing sysupdate.conf!!!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="234"/>
         <source>Checking for updates failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>System Updater</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message numerus="yes">
-        <location filename="../softmanager-sysupdate.cpp" line="513"/>
         <source>Error: Not enough free disk space for these updates! You will need %n MB to install the selected updates. Please select a different partition or free up some space to continue.</source>
         <translation type="unfinished">
-            <numerusform></numerusform>
+            <numerusform>
+            </numerusform>
         </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>ERROR:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="521"/>
         <source>Error determining remaining disk space!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="576"/>
         <source>Pending download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="586"/>
         <source>One or more updates will require a reboot. You will be prompted to restart after the update is finished.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="639"/>
         <source>Preparing to install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="655"/>
         <source>Pending install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="679"/>
         <source>Data verify failed... Attempting to re-download...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="692"/>
         <source>Downloading updates...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="757"/>
         <source>Checking data integrity...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="803"/>
         <source>An error occured while downloading. Please check your connection or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="829"/>
         <source>Data verified... Preparing to Install...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="887"/>
         <source>Updates successfully installed! Your system will need to reboot to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="889"/>
         <source>Updates successfully installed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="910"/>
         <source>Installing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="918"/>
         <source>Starting installation...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1120"/>
         <source>You must select an update to install!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>The update &apos;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>&apos; must be installed by itself. All other items will be unselected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="177"/>
         <source>Failed to connect to pbidir!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Install Software?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Do you want to install</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-webview.cpp" line="230"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>softwareConfigWidget</name>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Config Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="52"/>
         <source>Error: Your custom mirror needs to begin with ftp:// or http://</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Refresh Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="204"/>
         <source>Error fetching mirror list! Check your internet connection, or try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.cpp" line="280"/>
         <source>Select Temp directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="14"/>
         <source>Software Manager Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="28"/>
         <source>Mirrors</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="34"/>
         <source>Mirror Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="40"/>
         <source>Automatic Mirror Selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="50"/>
         <source>Select Mirror from list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="84"/>
         <source>Refresh Mirror Listing</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="100"/>
         <source>Specify a custom Mirror</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="134"/>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="140"/>
         <source>Download and install software updates automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="143"/>
         <source>Automatically update software</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="163"/>
         <source> Keep downloaded software in Temporary Directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="171"/>
         <source>System</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="177"/>
         <source>This will download updates in the background, and install them at shutdown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="180"/>
         <source>Automatically install available updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="201"/>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="209"/>
         <source>Temporary file directory:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="279"/>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softconfigwidget.ui" line="303"/>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>
     <name>updaterStatus</name>
     <message>
-        <location filename="../updaterDialog.cpp" line="19"/>
         <source>Update Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.cpp" line="132"/>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="14"/>
         <source>Installing Updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="46"/>
         <source>The system is currently installing the following updates:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="80"/>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="85"/>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="90"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../updaterDialog.ui" line="95"/>
         <source>ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 </TS>

Modified: pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hu.ts
===================================================================
--- pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hu.ts	2009-10-22 18:12:08 UTC (rev 4722)
+++ pcbsd/trunk/SoftwareManager/i18n/SoftwareManager_hu.ts	2009-10-22 18:12:18 UTC (rev 4723)
@@ -4,602 +4,582 @@
 <context>
     <name>PBM</name>
     <message>
-        <location filename="../softmanager-main.cpp" line="160"/>
         <source>You currently have PBIs downloading! Exit anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="201"/>
         <source>Cancel this download?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="207"/>
         <source>Remove this application?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
-        <location filename="../softmanager-sysupdate.cpp" line="204"/>
-        <location filename="../softmanager-sysupdate.cpp" line="1152"/>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="483"/>
         <source>This program must be run as root!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>Proxy Configuration!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
-        <location filename="../softmanager-main.cpp" line="600"/>
         <source>You will need to restart the system updater for