use translations from BRANCH

307 files changed, 13295 insertions, 5542 deletions

diff --git a/i18n/da/advancedfm.ts b/i18n/da/advancedfm.ts
index b052825..58b72d8 100644
--- a/i18n/da/advancedfm.ts
+++ b/i18n/da/advancedfm.ts
@@ -107,11 +107,11 @@
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Skift til lokal</translation>
+        <translation type="obsolete">Skift til lokal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Skift til ekstern</translation>
+        <translation type="obsolete">Skift til ekstern</translation>
     </message>
     <message>
         <source>Size</source>
@@ -271,16 +271,28 @@ og alt hvad der er i den?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
-        <translation type="obsolete">Filstyring :: </translation>
+        <translation type="unfinished">Filstyring :: </translation>
     </message>
     <message>
         <source> kB free</source>
-        <translation type="obsolete">kB ledig</translation>
+        <translation type="unfinished">kB ledig</translation>
     </message>
     <message>
         <source>Copy &apos;%1&apos; As</source>
         <translation type="obsolete">Kopier &apos;%1&apos; som</translation>
     </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -373,5 +385,9 @@ Afsluttet
         <source>Error setting mode</source>
         <translation>Der opstod fejl under indstilling af rettigheder</translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/calculator.ts b/i18n/da/calculator.ts
index 525bb4b..12975be 100644
--- a/i18n/da/calculator.ts
+++ b/i18n/da/calculator.ts
@@ -133,4 +133,203 @@
         <translation>Lommeregner</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/datebook.ts b/i18n/da/datebook.ts
index 9833180..5469bbc 100644
--- a/i18n/da/datebook.ts
+++ b/i18n/da/datebook.ts
@@ -370,7 +370,7 @@ Afslut alligevel?</translation>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation>MTOTFLSM</translation>
+        <translation type="obsolete">MTOTFLSM</translation>
     </message>
 </context>
 <context>
@@ -489,7 +489,7 @@ Afslut alligevel?</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Start tid</translation>
+        <translation type="obsolete">Start tid</translation>
     </message>
     <message>
         <source>All day</source>
@@ -527,6 +527,10 @@ Afslut alligevel?</translation>
         <source>Note...</source>
         <translation>Bemærkning...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">Start tid</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/da/libbatteryapplet.ts b/i18n/da/libbatteryapplet.ts
index e895936..46daf6c 100644
--- a/i18n/da/libbatteryapplet.ts
+++ b/i18n/da/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/libqpe.ts b/i18n/da/libqpe.ts
index 635fe39..564d08f 100644
--- a/i18n/da/libqpe.ts
+++ b/i18n/da/libqpe.ts
@@ -863,6 +863,22 @@ Frigør noget hukommelse og prøv igen.</translation>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Fejl</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/da/mailit.ts b/i18n/da/mailit.ts
index 3d729bc..fd9657c 100644
--- a/i18n/da/mailit.ts
+++ b/i18n/da/mailit.ts
@@ -200,6 +200,19 @@ Check user name and password&lt;/qt&gt;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/da/opieftp.ts b/i18n/da/opieftp.ts
index 6696d04..cfa73fa 100644
--- a/i18n/da/opieftp.ts
+++ b/i18n/da/opieftp.ts
@@ -245,5 +245,9 @@ Den skal være tom</translation>
         <source>Sorry name already taken</source>
         <translation>Desværre, navnet er allerede brugt</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/qpe.ts b/i18n/da/qpe.ts
index 4ca1b76..c039711 100644
--- a/i18n/da/qpe.ts
+++ b/i18n/da/qpe.ts
@@ -1,17 +1,79 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished">Program Problem</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;%1 svarer ikke.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Ønsker du at tvinge programmet til at afslutte?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>Program Problem</translation>
+        <translation type="obsolete">Program Problem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 svarer ikke.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;%1 svarer ikke.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Ønsker du at tvinge programmet til at afslutte?&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Ønsker du at tvinge programmet til at afslutte?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -19,27 +81,27 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>Klik præcist midt på krydset
+        <translation type="obsolete">Klik præcist midt på krydset
 for at kalibrere din skærm.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Velkommen til Opie</translation>
+        <translation type="obsolete">Velkommen til Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>Dokumenter</translation>
+        <translation type="obsolete">Dokumenter</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>Ikoner</translation>
+        <translation type="obsolete">Ikoner</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>Liste</translation>
+        <translation type="obsolete">Liste</translation>
     </message>
 </context>
 <context>
@@ -47,211 +109,382 @@ for at kalibrere din skærm.</translation>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>Batteri niveauet er kritisk!
+        <translation type="obsolete">Batteri niveauet er kritisk!
 Hold enheden slukket indtil den får strøm igen!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation>Batteriet er næsten tomt.</translation>
+        <translation type="obsolete">Batteriet er næsten tomt.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>Back-up batteriet er næsten tomt.
+        <translation type="obsolete">Back-up batteriet er næsten tomt.
 Genoplad venligst back-up batteriet.</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>visitkort</translation>
+        <translation type="obsolete">visitkort</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>Information</translation>
+        <translation type="obsolete">Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
+        <translation type="obsolete">&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
 (%1)&lt;/p&gt;&lt;p&gt;Ønsker du at indstille uret?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">Batteristatus</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation>Starter</translation>
+        <translation type="unfinished">Starter</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation> - Starter</translation>
+        <translation type="unfinished"> - Starter</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation>Intet program</translation>
+        <translation type="unfinished">Intet program</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>&lt;p&gt;Der er ikke defineret noget program til dette dokument.&lt;p&gt;Typen er %1.</translation>
+        <translation type="unfinished">&lt;p&gt;Der er ikke defineret noget program til dette dokument.&lt;p&gt;Typen er %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation>Finder dokumenter</translation>
+        <translation type="obsolete">Finder dokumenter</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation>Søger dokumenter</translation>
+        <translation type="obsolete">Søger dokumenter</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">Dokumenter</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished">Ikoner</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished">Liste</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>%1 filer</translation>
+        <translation type="obsolete">%1 filer</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>Alle typer filer</translation>
+        <translation type="obsolete">Alle typer filer</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation>Dokument visning</translation>
+        <translation type="unfinished">Dokument visning</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>Medie indsat</translation>
+        <translation type="obsolete">Medie indsat</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>Et &lt;b&gt;lager medie&lt;/b&gt; blev indsat. Skal det skannes for medie filer?</translation>
+        <translation type="obsolete">Et &lt;b&gt;lager medie&lt;/b&gt; blev indsat. Skal det skannes for medie filer?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Hvilke medie filer</translation>
+        <translation type="obsolete">Hvilke medie filer</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Lyd</translation>
+        <translation type="obsolete">Lyd</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Billede</translation>
+        <translation type="obsolete">Billede</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Tekst</translation>
+        <translation type="obsolete">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Video</translation>
+        <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Alle</translation>
+        <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>Link programmer</translation>
+        <translation type="obsolete">Link programmer</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>Begræns søgning til mappe: (ikke ibrug endnu)</translation>
+        <translation type="obsolete">Begræns søgning til mappe: (ikke ibrug endnu)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>Tilføj</translation>
+        <translation type="obsolete">Tilføj</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>Dit valg vil blive gemt på mediet.</translation>
+        <translation type="obsolete">Dit valg vil blive gemt på mediet.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>Spørg ikke igen for dette medie</translation>
+        <translation type="obsolete">Spørg ikke igen for dette medie</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation>Batteristatus</translation>
+        <translation type="obsolete">Batteristatus</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Information</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
+(%1)&lt;/p&gt;&lt;p&gt;Ønsker du at indstille uret?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">Batteri niveauet er kritisk!
+Hold enheden slukket indtil den får strøm igen!</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">Back-up batteriet er næsten tomt.
+Genoplad venligst back-up batteriet.</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished">visitkort</translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
-        <translation>Luk ned</translation>
+        <translation type="unfinished">Luk ned</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>Luk Opie</translation>
+        <translation type="unfinished">Luk Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation>Genstart</translation>
+        <translation type="unfinished">Genstart</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>Genstart Opie</translation>
+        <translation type="unfinished">Genstart Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation>Luk ned</translation>
+        <translation type="unfinished">Luk ned</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation>&lt;p&gt;
+        <translation type="unfinished">&lt;p&gt;
 Disse muligheder er primært givet til brug under udvikling og test af Opie systemet. I et normalt miljø er dette unødvendigt.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Fortryd</translation>
+        <translation type="unfinished">Fortryd</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation>Luk ned...</translation>
+        <translation type="unfinished">Luk ned...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>Synkroniserings-forbindelse</translation>
+        <translation type="unfinished">Synkroniserings-forbindelse</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Et uautoriseret system ønsker adgang til denne enhed.&lt;p&gt;Hvis du bruger en Qtopia Desktop version ælder end 1.5.1 skal du opgradere.</translation>
+        <translation type="unfinished">&lt;p&gt;Et uautoriseret system ønsker adgang til denne enhed.&lt;p&gt;Hvis du bruger en Qtopia Desktop version ælder end 1.5.1 skal du opgradere.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>Afvis</translation>
+        <translation type="unfinished">Afvis</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation>&lt;p&gt;Et ukendt system ønsker adgang til denne enhed.&lt;p&gt;Hvis det er første gang du synkroniserer er dette normalt.</translation>
+        <translation type="unfinished">&lt;p&gt;Et ukendt system ønsker adgang til denne enhed.&lt;p&gt;Hvis det er første gang du synkroniserer er dette normalt.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation>Tillad</translation>
+        <translation type="unfinished">Tillad</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>Synkroniserer</translation>
+        <translation type="obsolete">Synkroniserer</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Kontakter&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Kontakter&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Fortryd</translation>
+        <translation type="obsolete">&amp;Fortryd</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/showimg.ts b/i18n/da/showimg.ts
index f3fac97..f642aa8 100644
--- a/i18n/da/showimg.ts
+++ b/i18n/da/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/de/advancedfm.ts b/i18n/de/advancedfm.ts
index 3c1d458..1d8a7ff 100644
--- a/i18n/de/advancedfm.ts
+++ b/i18n/de/advancedfm.ts
@@ -40,11 +40,11 @@
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Lokalansicht</translation>
+        <translation type="obsolete">Lokalansicht</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Fernansicht</translation>
+        <translation type="obsolete">Fernansicht</translation>
     </message>
     <message>
         <source>Size</source>
@@ -268,11 +268,23 @@ and all it&apos;s contents ?</source>
     </message>
     <message>
         <source>AdvancedFm :: </source>
-        <translation type="obsolete">AdvancedFm :: </translation>
+        <translation>AdvancedFm :: </translation>
     </message>
     <message>
         <source> kB free</source>
-        <translation type="obsolete">kB frei</translation>
+        <translation>kB frei</translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation>Auf Ansicht 1 schalten</translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation>Auf Ansicht 2 schalten</translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation>Noch nicht implementiert</translation>
     </message>
 </context>
 <context>
@@ -364,5 +376,9 @@ Fertig</translation>
         <source>Error setting mode</source>
         <translation>Fehler beim Setzen des Modus</translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation>dateiBerechtigungen</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/backgammon.ts b/i18n/de/backgammon.ts
index 65f467d..7dc72f7 100644
--- a/i18n/de/backgammon.ts
+++ b/i18n/de/backgammon.ts
@@ -1,4 +1,5 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AI_Dialog</name>
     <message>
@@ -19,7 +20,7 @@
     </message>
     <message>
         <source>&lt;b&gt;Expose&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Aufdecken&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Protect&lt;/b&gt;</source>
@@ -52,7 +53,8 @@
     <message>
         <source>Expose you own pieces.
 After such a move only one piece will remain in the slot</source>
-        <translation type="unfinished"></translation>
+        <translation>Die eigenen Steine aufdecken.
+Danach wird nur ein Stein im Schacht verbleiben</translation>
     </message>
     <message>
         <source>Protect a single piece by
diff --git a/i18n/de/backup.ts b/i18n/de/backup.ts
index ab2801f..b820bbc 100644
--- a/i18n/de/backup.ts
+++ b/i18n/de/backup.ts
@@ -1,4 +1,5 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BackupAndRestore</name>
     <message>
@@ -12,47 +13,48 @@
     <message>
         <source>Error from System:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler vom System:
+</translation>
     </message>
     <message>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
-        <translation type="unfinished"></translation>
+        <translation>Sicherung fehlgeschlagen!</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Details</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
-        <translation type="unfinished"></translation>
+        <translation>Sichern und Wiederherstellen... Fehlgeschlagen!!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sichern erfolgreich.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wählen Sie etwas zum wiederherstellen.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiederherstellung fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Folgende Datei konnte nicht geöffnet werden: %1</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiederherstellung erfolgreich.</translation>
     </message>
 </context>
 <context>
@@ -95,22 +97,22 @@
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation type="unfinished"></translation>
+        <translation>Erneuere Dateiliste</translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler Information</translation>
     </message>
     <message>
         <source>Error Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler Meldung:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/bounce.ts b/i18n/de/bounce.ts
index afda86c..90cfdfb 100644
--- a/i18n/de/bounce.ts
+++ b/i18n/de/bounce.ts
@@ -1,4 +1,5 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>KJezzball</name>
     <message>
@@ -111,7 +112,15 @@ Try to reduce total space by 75%.
 
 This program is distributed under
 the terms of the GPL v2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geschrieben von: Stefan Schimanski
+Portiert von: Martin Imobersteg
+
+Klicken um Wände zu erzeugen.
+Leertaste um Wandrichtung zu wechseln.
+Versuchen sie den Platz um 75% zu verkleinern
+
+Dieses Programm wird unter den 
+Bedingungen der GPL v2 vertrieben.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/calculator.ts b/i18n/de/calculator.ts
index 2641918..573dfeb 100644
--- a/i18n/de/calculator.ts
+++ b/i18n/de/calculator.ts
@@ -133,4 +133,204 @@
         <translation>Standard</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation>Gewicht
+</translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation>Distanz</translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation>Radial</translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Volumen</translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation>acres</translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation>°C</translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation>karat</translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation>cm³</translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation>ft³</translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation>inch³</translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation>°F</translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation>fl oz (US)</translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation>foot</translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation>g</translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation>gal (US)</translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation>hektar</translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation>inch</translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation>km</translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation>l</translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation>pfund</translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation>long tons</translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation>mg</translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation>mile</translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation>ml</translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation>mm</translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation>Seemeilen</translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation>unze</translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation>points</translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation>pint</translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation>quart</translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation>cm²</translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation>ft²</translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation>inch²</translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation>km²</translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation>m²</translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation>mile²</translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation>mm²</translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation>yard²</translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation>stone</translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation>short tons</translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation>Esslöffel</translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation>Teelöffel</translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation>tonnen</translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation>yard</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/checkbook.ts b/i18n/de/checkbook.ts
index db06496..299fe94 100644
--- a/i18n/de/checkbook.ts
+++ b/i18n/de/checkbook.ts
@@ -1,4 +1,5 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
@@ -510,7 +511,7 @@ Der Wer der Gebühr sollte immer positiv sein.</translation>
     </message>
     <message>
         <source>Electronics</source>
-        <translation type="unfinished"></translation>
+        <translation>Elektronik</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/datebook.ts b/i18n/de/datebook.ts
index 9da48a0..35f16b3 100644
--- a/i18n/de/datebook.ts
+++ b/i18n/de/datebook.ts
@@ -370,7 +370,7 @@ Trozdem beenden?</translation>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation>MDMDFSSM</translation>
+        <translation type="obsolete">MDMDFSSM</translation>
     </message>
 </context>
 <context>
@@ -457,7 +457,7 @@ Trozdem beenden?</translation>
     </message>
     <message>
         <source>Yearly...</source>
-        <translation>Jählich...</translation>
+        <translation>Jährlich...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
@@ -516,7 +516,7 @@ Trozdem beenden?</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Startzeit</translation>
+        <translation type="obsolete">Startzeit</translation>
     </message>
     <message>
         <source>All day</source>
@@ -562,6 +562,10 @@ Trozdem beenden?</translation>
         <source>Note...</source>
         <translation>Notizen...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation>Startzeit</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/de/euroconv.ts b/i18n/de/euroconv.ts
index ae84dc6..c08a952 100644
--- a/i18n/de/euroconv.ts
+++ b/i18n/de/euroconv.ts
@@ -1,9 +1,10 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>Euroconv</source>
-        <translation type="unfinished">Euroconv</translation>
+        <translation>Eurokonvertierer</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/helpbrowser.ts b/i18n/de/helpbrowser.ts
index bc0e126..306e741 100644
--- a/i18n/de/helpbrowser.ts
+++ b/i18n/de/helpbrowser.ts
@@ -1,4 +1,5 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HelpBrowser</name>
     <message>
@@ -31,7 +32,7 @@
     </message>
     <message>
         <source>Go</source>
-        <translation type="unfinished"></translation>
+        <translation>Gehe</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/kpacman.ts b/i18n/de/kpacman.ts
index 6ae327a..bcbae46 100644
--- a/i18n/de/kpacman.ts
+++ b/i18n/de/kpacman.ts
@@ -220,10 +220,6 @@ oder iist in einem unbekannten Format.</translation>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@DD@/@MM@/@YY@</translation>
     </message>
-    <message>
-        <source>                          </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Status</name>
diff --git a/i18n/de/libbatteryapplet.ts b/i18n/de/libbatteryapplet.ts
index b1b6d64..83bff6a 100644
--- a/i18n/de/libbatteryapplet.ts
+++ b/i18n/de/libbatteryapplet.ts
@@ -82,5 +82,17 @@
         <source>Battery status</source>
         <translation>Batteriestatus</translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation>keine Daten</translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation>iPAQ</translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation>Jacket</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/libinterfaces.ts b/i18n/de/libinterfaces.ts
index 6615d55..179569b 100644
--- a/i18n/de/libinterfaces.ts
+++ b/i18n/de/libinterfaces.ts
@@ -107,7 +107,7 @@
     </message>
     <message>
         <source>be &amp;silent</source>
-        <translation type="unfinished"></translation>
+        <translation>sei &amp;still</translation>
     </message>
 </context>
 <context>
@@ -150,7 +150,7 @@
     </message>
     <message>
         <source>255.255.255.0</source>
-        <translation type="unfinished">00:00:00:00:00:0 {255.255.255.0?}</translation>
+        <translation>255.255.255.0</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/libkppp.ts b/i18n/de/libkppp.ts
index eb0fe65..d70516d 100644
--- a/i18n/de/libkppp.ts
+++ b/i18n/de/libkppp.ts
@@ -453,7 +453,7 @@ neues Gerät kopiert, das modifiziert werden kann</translation>
     </message>
     <message>
         <source>You must enter a unique device name</source>
-        <translation type="unfinished">Sie müssen einen eindeutigen Gerätnamen angeben</translation>
+        <translation>Sie müssen einen eindeutigen Gerätnamen angeben</translation>
     </message>
 </context>
 <context>
@@ -702,12 +702,20 @@ on this information, but it can also cause several
 &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
 
 Don&apos;t enable this unless you really need it.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Bei jeder Verbindung wird Ihr Hostname so
+verändert, dass er der IP Adresse entspricht, die
+vom PPP Server erhalten wurde. Dies kann bei
+Protokollen nützlich sein, die diese Information
+benötigen, kann aber auch zu einigen &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;Problemen&lt;/a&gt;
+führen.
+
+Bitte nicht anschalten, wenn nicht benötigt.</translation>
     </message>
     <message>
         <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
 For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Diese Option zu wählen könnte merkwürdige Probleme mit dem X-Server und Anwendungen produzieren während kppp verbunden ist. Tun Sie es nicht, wenn Sie nicht wissen, was Sie hier tun!
+Für mehr information schauen Sie in das Handbuch (oder die Hilfe) unter der Sektion &quot;Regelmässig gestellte Fragen&quot;.</translation>
     </message>
     <message>
         <source>Warning</source>
@@ -735,18 +743,18 @@ Bitte Passwort eingeben</translation>
     <name>ModemTransfer</name>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Fehler</translation>
+        <translation>Fehler</translation>
     </message>
 </context>
 <context>
     <name>ModemWidget</name>
     <message>
         <source>Modem &amp;name:</source>
-        <translation>Modem &amp;name:</translation>
+        <translation>Modem &amp;Name:</translation>
     </message>
     <message>
         <source>Modem de&amp;vice:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem &amp;Gerät:</translation>
     </message>
     <message>
         <source>This specifies the serial port your modem is attached 
@@ -756,23 +764,29 @@ to. On Linux/x86, typically this is either /dev/ttyS0
 If you have an internal ISDN card with AT command
 emulation (most cards under Linux support this), you
 should select one of the /dev/ttyIx devices.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dies gibt den seriellen Port an, an dem das Modem angeschlossen
+ist. Auf Linux/x86 ist das typischer Weise entweder /dev/ttyS0
+(COM1 unter DOS) oder /dev/ttyS1 (COM2 unter DOS).
+
+Wenn Sie eine interner ISDN Karte mit AT Kommando Emulation
+haben (die meisten Karten unter Linux unterstützen dies), sollten
+eines der /dev/ttyIx Geräte auswählen.</translation>
     </message>
     <message>
         <source>&amp;Flow control:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Fluss Kontrolle:</translation>
     </message>
     <message>
         <source>Hardware [CRTSCTS]</source>
-        <translation type="unfinished"></translation>
+        <translation>Hardware [CRTSCTS]</translation>
     </message>
     <message>
         <source>Software [XON/XOFF]</source>
-        <translation type="unfinished"></translation>
+        <translation>Software [XON/XOFF]</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how the serial port and modem
@@ -780,11 +794,15 @@ communicate. You should not change this unless
 you know what you are doing.
 
 &lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Gibt an, wie der serielle Port und das Modem
+kommunizieren. Sollte nicht geändert werden, wenn
+man nicht weiß, was man tut.
+
+&lt;b&gt;Standard&lt;/b&gt;: CRTSCTS</translation>
     </message>
     <message>
         <source>&amp;Line termination:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zeilenende:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how AT commands are sent to your
@@ -794,11 +812,18 @@ to the init string, you should try different
 settings here
 
 &lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Gibt an, wie AT Kommandos zum Modem
+gesendet werden. Normaler Weise ist der Standard
+&lt;i&gt;CR/LF&lt;/i&gt; völlig okay. Wenn das Modem nicht auf
+die Initialisierung antwortet, sollten hier andere 
+Einstellungen probiert werden.
+
+&lt;b&gt;Standardt&lt;/b&gt;: CR/LF</translation>
     </message>
     <message>
         <source>Co&amp;nnection speed:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Verbindungs-
+geschwindigkeit:</translation>
     </message>
     <message>
         <source>Specifies the speed your modem and the serial
@@ -807,11 +832,16 @@ the default of 38400 bits/sec. If everything
 works you can try to increase this value, but to
 no more than 115200 bits/sec (unless you know
 that your serial port supports higher speeds).</source>
-        <translation type="unfinished"></translation>
+        <translation>Gibt die Geschwindigkeit an, mit der sich das
+Modem und die ser. Schnittstelle unterhalten.
+Sie sollten mit 38400 bits/Sek beginnen, wenn
+alles funktioniert, erhöhen Sie, aber nie mehr
+als 115200 bits/Sek, ausser Sie wissen, dass
+Ihre Schnittstelle das unterstützt.</translation>
     </message>
     <message>
         <source>&amp;Use lock file</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Benutze Sperrdatei</translation>
     </message>
     <message>
         <source>&lt;p&gt;To prevent other programs from accessing the
@@ -823,32 +853,42 @@ Here you can select whether this locking will
 be done.
 
 &lt;b&gt;Default&lt;/b&gt;: On</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Um zu verhindern, dass andere Programme
+das Modem während des Verbindungsaufbaus
+benutzen, kann eine Datei erzeugt werden, die
+es als benutzt markiert. Bei Linux wäre das z.B.
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Hier kann eingestellt werden, ob diese 
+Sperrung vollzogen werden soll.
+
+&lt;b&gt;Standard&lt;/b&gt;: An</translation>
     </message>
     <message>
         <source>Modem timeout:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem Zeitüberschreitung:</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"></translation>
+        <translation>Sek</translation>
     </message>
     <message>
         <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
 &lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
 recommended value is 30 seconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dies definiert, wie lange &lt;i&gt;kpp&lt;/i&gt; auf eine
+&lt;i&gt;CONNECT&lt;/i&gt; Antwort vom Modem
+warten soll. Ratschlag: 30 Sekunden.</translation>
     </message>
 </context>
 <context>
     <name>ModemWidget2</name>
     <message>
         <source>Busy wait:</source>
-        <translation type="unfinished"></translation>
+        <translation>Auf Besetzt warten:</translation>
     </message>
     <message>
         <source>&amp;Wait for dial tone before dialing</source>
-        <translation type="unfinished"></translation>
+        <translation>Vor der Anwahl auf &amp;Wählton warten</translation>
     </message>
     <message>
         <source>&lt;p&gt;Normally the modem waits for a dial tone
@@ -858,11 +898,18 @@ recognize this sound, or your local phone system
 does not emit such a tone, uncheck this option
 
 &lt;b&gt;Default:&lt;/b&gt;: On</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Normaler Weise wartet ein Modem auf den
+Wählton der Telefonleitung, der anzeigt, dass
+die Nummer gewählt werden kann. Sollte ihr
+Modem das nicht können oder ihr Telefon-
+system so einen Ton nicht senden, schalten
+Sie diese Option aus.
+
+&lt;b&gt;Standard&lt;/b&gt;: An</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"></translation>
+        <translation>Sek</translation>
     </message>
     <message>
         <source>Specifies the number of seconds to wait before
@@ -872,11 +919,17 @@ same number is busy too often.
 
 The default is 0 seconds, you should not change
 this unless you need to.</source>
-        <translation type="unfinished"></translation>
+        <translation>Gibt die zu wartenden Sekunden vor einer
+Neuanwahl an, wenn alle gewählten Nummern
+besetzt sind. Wichtig, weil manche Modems
+Probleme bei mehrfach besetzter gleicher Nr.
+haben.
+Der Standard ist 0 Sek., das sollte nicht ge-
+ändert werden, außer wenn benötigt.</translation>
     </message>
     <message>
         <source>Modem &amp;volume:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem &amp;Lautstärke:</translation>
     </message>
     <message>
         <source>Most modems have a speaker which makes
@@ -886,11 +939,17 @@ lower volume.
 
 If this does not work for your modem,
 you must modify the modem volume command.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die meisten Modems haben Lautsprecher, die
+recht laut beim wählen sind. Hier können Sie
+die Lautstärke entweder aus oder leiser stellen.
+
+Wenn das mit Ihrem Modem nicht funktioniert,
+muss das Modem Lautstärke Kommando
+geändert werden.</translation>
     </message>
     <message>
         <source>Modem asserts CD line</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem stellt CD Leitung sicher</translation>
     </message>
     <message>
         <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
@@ -898,20 +957,25 @@ is not responding. Unless you are having
 problems with this, do not modify this setting.
 
 &lt;b&gt;Default&lt;/b&gt;: Off</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontrolliert, wie &lt;i&gt;kppp&lt;/i&gt; ein nicht antwortendes
+Modem erkennt. Wenn Sie keine Probleme hiermit
+haben, ändern Sie diese Einstellung bitte nicht.
+
+&lt;b&gt;Standard&lt;/b&gt;: Aus</translation>
     </message>
     <message>
         <source>Mod&amp;em Commands...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mod&amp;em Kommandos...</translation>
     </message>
     <message>
         <source>Allows you to change the AT command for
 your modem.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier kann man die AT Kommandos des
+Modems ändern.</translation>
     </message>
     <message>
         <source>&amp;Query Modem...</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem &amp;abfragen...</translation>
     </message>
     <message>
         <source>Most modems support the ATI command set to
@@ -920,30 +984,35 @@ find out vendor and revision of your modem.
 Press this button to query your modem for
 this information. It can be useful to help
 you setup the modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Die meisten Modems unterstützen en ATI
+Kommandosatz um Lieferant und Revision des
+Modems herauszufinden.
+Betäatigen Sie diesen Knopf, um ihr Modem
+abzufragen. Dies kann beim Setup des 
+Modems helfen</translation>
     </message>
 </context>
 <context>
     <name>PPPConfigWidget</name>
     <message>
         <source>Configure Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem konfigurieren</translation>
     </message>
     <message>
         <source>Modem failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem Fehler</translation>
     </message>
     <message>
         <source>A critical failure appeard while testing the modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Ein kritischer Fehler trat beim Modemtest auf</translation>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Konten</translation>
     </message>
     <message>
         <source>&amp;Devices</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Geräte</translation>
     </message>
 </context>
 <context>
@@ -954,7 +1023,7 @@ you setup the modem</source>
     </message>
     <message>
         <source>Argument:</source>
-        <translation type="unfinished"></translation>
+        <translation>Parameter:</translation>
     </message>
     <message>
         <source>Add</source>
@@ -966,7 +1035,7 @@ you setup the modem</source>
     </message>
     <message>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardwerte</translation>
     </message>
 </context>
 <context>
@@ -984,432 +1053,441 @@ you setup the modem</source>
     <name>QObject</name>
     <message>
         <source>PPP</source>
-        <translation type="unfinished"></translation>
+        <translation>PPP</translation>
     </message>
     <message>
         <source>generic ppp device</source>
-        <translation type="unfinished"></translation>
+        <translation>generisches PPP-Gerät</translation>
     </message>
     <message>
         <source>Unable to open modem.</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte Modem nicht ansprechen.</translation>
     </message>
     <message>
         <source>Unable to detect state of CD line.</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte den Status der CD Leitung nicht erkennen.</translation>
     </message>
     <message>
         <source>The modem is not ready.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Modem ist nicht bereit.</translation>
     </message>
     <message>
         <source>The modem is busy.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Modem ist besetzt.</translation>
     </message>
     <message>
         <source>Modem Ready.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem bereit.</translation>
     </message>
     <message>
         <source>Can&apos;t restore tty settings: tcsetattr()
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Kann tty Einstellungen nicht wieder herstellen: tcsetattr()
+</translation>
     </message>
     <message>
         <source>The modem does not respond.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Modem antwortet nicht.</translation>
     </message>
     <message>
         <source>Unknown speed</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannte Geschwindigkeit</translation>
     </message>
     <message>
         <source>ATI Query</source>
-        <translation type="unfinished"></translation>
+        <translation>ATI Abfrage</translation>
     </message>
     <message>
         <source>Unable to create modem lock file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte Modem Sperrdatei nicht erzeugen.</translation>
     </message>
     <message>
         <source>Looking for modem...</source>
-        <translation type="unfinished"></translation>
+        <translation>Schaue nach Modem...</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbruch</translation>
     </message>
     <message>
         <source>Modem Query timed out.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeitüberschreitung bei Modemabfrage.</translation>
     </message>
     <message>
         <source>Modem device is locked.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem Gerät ist gesperrt.</translation>
     </message>
     <message>
         <source>Modem Ready</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem bereit</translation>
     </message>
     <message>
         <source>One moment please...</source>
-        <translation type="unfinished"></translation>
+        <translation>Einen Moment bitte...</translation>
     </message>
     <message>
         <source>Modem Query Results</source>
-        <translation type="unfinished"></translation>
+        <translation>Ergebnis der Modemabfrage</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Schließen</translation>
     </message>
     <message>
         <source>You&apos;re not allowed to dial out with kppp.
 Contact your system administrator.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie sind nicht befugt mit kppp zu wählen.
+Bitte kontaktieren Sie ihren Systemadministrator.</translation>
     </message>
     <message>
         <source>Cannot find the PPP daemon!
 Make sure that pppd is installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann den PPP dämon nicht finden!
+Stellen Sie sicher, dass pppd installiert ist.</translation>
     </message>
     <message>
         <source>You do not have the permission to start pppd!
 Contact your system administrator and ask to get access to pppd.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben keine Berechtigung pppd zu starten!
+Fragen Sie Ihren Systemadministrator nach Zugriffsrechten auf pppd.</translation>
     </message>
     <message>
         <source>You don&apos;t have sufficient permission to run
 %1
 Please make sure that kppp is owned by root and has the SUID bit set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben nicht ausreichend Erlaubnis, um
+%1 auszuführen.
+Stellen Sie sicher, dass kppp root gehört und das SUID bit gesetzt ist.</translation>
     </message>
     <message>
         <source>%1 is missing or can&apos;t be read!
 Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 fehlt oder kann nicht gelesen werden!
+Bitten Sie Ihren Systemadministrator diese Datei (sie kann leer sein) mit passenden Lese- und Schreibrechten zu erzeugen .</translation>
     </message>
     <message>
         <source>Edit Modem Commands</source>
-        <translation type="unfinished"></translation>
+        <translation>Modemkommandos bearbeiten</translation>
     </message>
     <message>
         <source>Pre-init delay (sec/100):</source>
-        <translation type="unfinished"></translation>
+        <translation>Vor-Initial.-Verzögerung
+(Sek/100):</translation>
     </message>
     <message>
         <source>Initialization string %1:</source>
-        <translation type="unfinished"></translation>
+        <translation>Initialisierung:</translation>
     </message>
     <message>
         <source>Post-init delay (sec/100):</source>
-        <translation type="unfinished"></translation>
+        <translation>Nach-Initial. Verzögerung
+(Sek/100):</translation>
     </message>
     <message>
         <source>Dialing speed (sec/100):</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählgeschwindigkeit
+(Sek/100):</translation>
     </message>
     <message>
         <source>Init response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Init. Antwort:</translation>
     </message>
     <message>
         <source>No dial tone detection:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ohne Wählton Erkennung:</translation>
     </message>
     <message>
         <source>Dial string:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähl-Zeichenkette:</translation>
     </message>
     <message>
         <source>Connect response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindungsantwort:</translation>
     </message>
     <message>
         <source>Busy response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Besetzt Antwort:</translation>
     </message>
     <message>
         <source>No carrier response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ohne Träger Antwort:</translation>
     </message>
     <message>
         <source>No dial tone response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ohne Wählton Antwort:</translation>
     </message>
     <message>
         <source>Hangup string:</source>
-        <translation type="unfinished"></translation>
+        <translation>Auflegezeichenkette:</translation>
     </message>
     <message>
         <source>Hangup response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Auflegeantwort:</translation>
     </message>
     <message>
         <source>Answer string:</source>
-        <translation type="unfinished"></translation>
+        <translation>Antwort Zeichenkette:</translation>
     </message>
     <message>
         <source>Ring response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Klingel Antwort:</translation>
     </message>
     <message>
         <source>Answer response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Antwort Reaktion:</translation>
     </message>
     <message>
         <source>Escape string:</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbruch Zeichenkette:</translation>
     </message>
     <message>
         <source>Escape response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbruch Antwort:</translation>
     </message>
     <message>
         <source>Guard time (sec/50):</source>
-        <translation type="unfinished"></translation>
+        <translation>Wächter Zeit (sec/50):</translation>
     </message>
     <message>
         <source>Volume off/low/high:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lautstärke aus/leise/laut:</translation>
     </message>
     <message>
         <source>Connected at:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbunden mit:</translation>
     </message>
     <message>
         <source>Time connected:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindungsdauer:</translation>
     </message>
     <message>
         <source>Volume:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lautstärke:</translation>
     </message>
     <message>
         <source>Session Bill:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sitzungsrechnung:</translation>
     </message>
     <message>
         <source>Total Bill:</source>
-        <translation type="unfinished"></translation>
+        <translation>Komplette Abrechnung:</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Getrennt</translation>
     </message>
     <message>
         <source>Byte</source>
-        <translation type="unfinished">Byte</translation>
+        <translation>ByteByte</translation>
     </message>
     <message>
         <source>KB</source>
-        <translation type="unfinished">KB</translation>
+        <translation>KBKB</translation>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished">MB</translation>
+        <translation>MBMB</translation>
     </message>
     <message>
         <source>GB</source>
-        <translation type="unfinished">GB</translation>
+        <translation>GBGB</translation>
     </message>
     <message>
         <source>Connecting to: </source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinde mit:</translation>
     </message>
     <message>
         <source>Online</source>
-        <translation type="unfinished"></translation>
+        <translation>Online</translation>
     </message>
     <message>
         <source>Offline</source>
-        <translation type="unfinished"></translation>
+        <translation>Offline</translation>
     </message>
     <message>
         <source>Log</source>
-        <translation type="unfinished"></translation>
+        <translation>Log</translation>
     </message>
     <message>
         <source>Connecting to: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinde mit: %1</translation>
     </message>
     <message>
         <source>Running pre-startup command...</source>
-        <translation type="unfinished"></translation>
+        <translation>Führe Vor-Startup Kommando aus...</translation>
     </message>
     <message>
         <source>Initializing modem...</source>
-        <translation type="unfinished"></translation>
+        <translation>Initialisiere Modem...</translation>
     </message>
     <message>
         <source>Setting </source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellung</translation>
     </message>
     <message>
         <source>Setting speaker volume...</source>
-        <translation type="unfinished"></translation>
+        <translation>Setze Lautsprecher-Lautstärke...</translation>
     </message>
     <message>
         <source>Turning off dial tone waiting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Warte auf Wählton-Abschaltung...</translation>
     </message>
     <message>
         <source>Dialing %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle %1</translation>
     </message>
     <message>
         <source>Line busy. Hanging up...</source>
-        <translation type="unfinished"></translation>
+        <translation>Leitung besetzt, lege auf...</translation>
     </message>
     <message>
         <source>Line busy. Waiting: %1 seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Leitung besetzt, warte %1 Sekunden</translation>
     </message>
     <message>
         <source>No Dialtone</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Wählton</translation>
     </message>
     <message>
         <source>No Carrier</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Trägersignal</translation>
     </message>
     <message>
         <source>Scanning %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Untersuche %1</translation>
     </message>
     <message>
         <source>Saving %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichere %1</translation>
     </message>
     <message>
         <source>Sending %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Sende %1</translation>
     </message>
     <message>
         <source>Expecting %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erwarte %1</translation>
     </message>
     <message>
         <source>Pause %1 seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Pausiere %1 Sekunden</translation>
     </message>
     <message>
         <source>Timeout %1 seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Timeout %1 Sekunden</translation>
     </message>
     <message>
         <source>Hangup</source>
-        <translation type="unfinished"></translation>
+        <translation>Auflegen</translation>
     </message>
     <message>
         <source>Answer</source>
-        <translation type="unfinished"></translation>
+        <translation>Antwort</translation>
     </message>
     <message>
         <source>ID %1</source>
-        <translation type="unfinished"></translation>
+        <translation>ID %1</translation>
     </message>
     <message>
         <source>Password %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort %1</translation>
     </message>
     <message>
         <source>Prompting %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Gebe %1 ein</translation>
     </message>
     <message>
         <source>PW Prompt %1</source>
-        <translation type="unfinished"></translation>
+        <translation>PW Eingabe %1</translation>
     </message>
     <message>
         <source>Loop Start %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Schleifen Start %1</translation>
     </message>
     <message>
         <source>ERROR: Nested too deep, ignored.</source>
-        <translation type="unfinished"></translation>
+        <translation>FEHLER: Zu tief verschachtelt, ignoriert.</translation>
     </message>
     <message>
         <source>Loops nested too deeply!</source>
-        <translation type="unfinished"></translation>
+        <translation>Schleifen zu tief verschachtelt!</translation>
     </message>
     <message>
         <source>Loop End %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Schleifen Ende %1</translation>
     </message>
     <message>
         <source>LoopEnd without matching Start! Line: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>LoopEnd ohne passende Start! Zeile: %1</translation>
     </message>
     <message>
         <source>Starting pppd...</source>
-        <translation type="unfinished"></translation>
+        <translation>Starte pppd...</translation>
     </message>
     <message>
         <source>Scan Var: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Suche Var: %1</translation>
     </message>
     <message>
         <source>Found: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Fand: %1</translation>
     </message>
     <message>
         <source>Looping: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Schleife: %1</translation>
     </message>
     <message>
         <source>Script timed out!</source>
-        <translation type="unfinished"></translation>
+        <translation>Skript Zeitabbruch!</translation>
     </message>
     <message>
         <source>Scanning: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Untersuche: %1</translation>
     </message>
     <message>
         <source>Expecting: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Erwarte %1</translation>
     </message>
     <message>
         <source>Logging on to network...</source>
-        <translation type="unfinished"></translation>
+        <translation>Am Netzwerk anmelden...</translation>
     </message>
     <message>
         <source>Running startup command...</source>
-        <translation type="unfinished"></translation>
+        <translation>Führe Startup Kommando aus...</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation type="unfinished"></translation>
+        <translation>Fertig</translation>
     </message>
     <message>
         <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
-        <translation type="unfinished">&lt;p&gt;Löscht das gewählte Gerät
-
-&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Vorsichtig verwenden !!!&lt;/b&gt;&lt;/font&gt;</translation>
+        <translation>pppd Kommando + Kommadozeilen Argumente 
+überschreiten 2024 Zeichen.</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Kann PPP dämon nicht finden!&lt;br&gt;Stellen Sie sicher, dass PPP installiert ist und sie den korrekten Pfad angegeben haben.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Kann folgendes nicht ausführen:&lt;br&gt; %1&lt;br&gt;Bitte stellen Sie sicher, dass Sie die setuid Berechtigung gegeben haben und pppd ausführbar ist.&lt;br&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Kann nicht finden:&lt;br&gt; %1&lt;br&gt;Bitte stellen Sie sicher, dass das Modem Gerät korrekt eingerichtet ist und Sie den Ort des Gerätes im Modem Reiter richtig angegeben haben.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Sie haben PAP oder CHAP als Authentifizierungsmethode gewählt. Das setzt die Angabe von Benutzername und Passwort voraus!&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Kann nicht PAP/CHAP Authentifikationsdatei&lt;br&gt;&quot;%1&quot; erzeugen&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>You must specify a telephone number!</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie müssen eine Telefonnummer angeben!</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/libliquid.ts b/i18n/de/libliquid.ts
index a5d2504..dbf7f33 100644
--- a/i18n/de/libliquid.ts
+++ b/i18n/de/libliquid.ts
@@ -11,66 +11,66 @@
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation type="unfinished">Liquid Stil</translation>
+        <translation>Liquid Stil</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">Kein Durchscheinen</translation>
+        <translation>Kein Durchscheinen</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">getüpfelte Hintergrundfarbe</translation>
+        <translation>getüpfelte Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">getüpfelte Buttonfarbe</translation>
+        <translation>getüpfelte Buttonfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Durchscheinend getüpfelt, Hintergrundfarbe</translation>
+        <translation>Durchscheinend getüpfelt, Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">Durchscheinend getüpfelt, Buttonfarbe</translation>
+        <translation>Durchscheinend getüpfelt, Buttonfarbe</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Benutzerdef. Durchscheinen</translation>
+        <translation>Benutzerdef. Durchscheinen</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Menüfarbe</translation>
+        <translation>Menüfarbe</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Textfarbe</translation>
+        <translation>Textfarbe</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">TRansparenz</translation>
+        <translation>Transparenz</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Schattierten Menutext verwenden</translation>
+        <translation>Schattierten Menütext verwenden</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Flache Werkzeugleistenbuttons</translation>
+        <translation>Flache Werkzeugleistenbuttons</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">getüpfelter Kontrast</translation>
+        <translation>getüpfelter Kontrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation type="unfinished">Liquid</translation>
+        <translation>Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">Hoch perfomanter Liquid-Stil von Mosfet</translation>
+        <translation>Hoch perfomanter Liquid-Stil von Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libopie.ts b/i18n/de/libopie.ts
index 109ef21..e96a58d 100644
--- a/i18n/de/libopie.ts
+++ b/i18n/de/libopie.ts
@@ -1,4 +1,5 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Button</name>
     <message>
@@ -31,35 +32,35 @@
     </message>
     <message>
         <source>Lower+Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiefgestellt+Hoch</translation>
     </message>
     <message>
         <source>Lower+Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiefgestellt+Runter</translation>
     </message>
     <message>
         <source>Lower+Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiefgestellt+Rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiefgestellt+Links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Hochgestellt +Hoch</translation>
     </message>
     <message>
         <source>Upper+Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Hochgestellt +Runter</translation>
     </message>
     <message>
         <source>Upper+Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Hochgestellt +Rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Hochgestellt +Links</translation>
     </message>
 </context>
 <context>
@@ -392,7 +393,7 @@ und</translation>
     </message>
     <message>
         <source>on </source>
-        <translation type="unfinished"></translation>
+        <translation>an</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/libqpe.ts b/i18n/de/libqpe.ts
index d5a0d97..909f614 100644
--- a/i18n/de/libqpe.ts
+++ b/i18n/de/libqpe.ts
@@ -1,4 +1,5 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Categories</name>
     <message>
@@ -864,6 +865,22 @@ frei und versuchen Sie es noch einmal
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation>Konnte die Anwendung nicht finden</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation>Konnte die Anwendung nicht starten</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/de/mailit.ts b/i18n/de/mailit.ts
index c587833..8efd9fd 100644
--- a/i18n/de/mailit.ts
+++ b/i18n/de/mailit.ts
@@ -26,15 +26,15 @@
     <name>EditAccount</name>
     <message>
         <source>Edit Account</source>
-        <translation>Account bearbeiten</translation>
+        <translation>Konto bearbeiten</translation>
     </message>
     <message>
         <source>Create new Account</source>
-        <translation>Account erstellen</translation>
+        <translation>Konto erstellen</translation>
     </message>
     <message>
         <source>Account name</source>
-        <translation>Accountname</translation>
+        <translation>Kontoname</translation>
     </message>
     <message>
         <source>Your name</source>
@@ -81,7 +81,7 @@
     </message>
     <message>
         <source>Accounts</source>
-        <translation>Accounts</translation>
+        <translation>Konten</translation>
     </message>
     <message>
         <source>Get Mail in</source>
@@ -89,11 +89,11 @@
     </message>
     <message>
         <source>Edit account</source>
-        <translation>Account bearbeiten</translation>
+        <translation>Konto bearbeiten</translation>
     </message>
     <message>
         <source>Delete account</source>
-        <translation>Account löschen</translation>
+        <translation>Konto löschen</translation>
     </message>
     <message>
         <source>Send mail</source>
@@ -137,7 +137,7 @@
     </message>
     <message>
         <source>You must create an account</source>
-        <translation>Sie müssen einen Account erstellen ...</translation>
+        <translation>Sie müssen ein Konto erstellen</translation>
     </message>
     <message>
         <source>Main operation toolbar</source>
@@ -175,24 +175,25 @@ nicht heruntergeladen werden kann</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Unknown response from server&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Unbekannte Antwort vom Server&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;host not found&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Host nicht gefunden&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;connection refused&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Verbindung abgelehnt&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;socket packet error&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Socket Paket Fehler&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Login failed
 Check user name and password&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Login Fehler! Überprüfen 
+Sie Name und Passwort&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Receiving error</source>
@@ -204,6 +205,20 @@ Check user name and password&lt;/qt&gt;</source>
         <translation>OK
 </translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation>Mailit! Kein Konto definiert</translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation>Konto löschen:
+</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Neu</translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
@@ -257,11 +272,11 @@ Möchten Sie dies jetzt durchführen ?</translation>
     </message>
     <message>
         <source>Mailit</source>
-        <translation type="unfinished"></translation>
+        <translation>Mailit</translation>
     </message>
     <message>
         <source>Read Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Mail lesen</translation>
     </message>
 </context>
 <context>
@@ -356,7 +371,7 @@ können.</translation>
     </message>
     <message>
         <source>This button opens the address selector with all mail adresses from your Opie addressbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Knopf öffnet die Adressen-Auswahl mit allen Mailadressen aus Ihrem Opie Adressbuch</translation>
     </message>
 </context>
 <context>
@@ -488,27 +503,27 @@ Halten Sie den Stift gedrückt für weitere Optionen.</translation>
     </message>
     <message>
         <source>Exploring attatchments</source>
-        <translation type="unfinished"></translation>
+        <translation>Anhänge anschauen</translation>
     </message>
     <message>
         <source>Attatchment</source>
-        <translation type="unfinished"></translation>
+        <translation>Anhang</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ</translation>
     </message>
     <message>
         <source>Installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Installiert</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nein</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/opie-console.ts b/i18n/de/opie-console.ts
index 33bfa8f..870c7af 100644
--- a/i18n/de/opie-console.ts
+++ b/i18n/de/opie-console.ts
@@ -1,878 +1,881 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Einrichtung der Wählparameter</translation>
     </message>
     <message>
         <source>Settings1</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen1</translation>
     </message>
     <message>
         <source>Settings2</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen2</translation>
     </message>
     <message>
         <source>Init string </source>
-        <translation type="unfinished"></translation>
+        <translation>Initialisierungs-
+zeichenfolge</translation>
     </message>
     <message>
         <source>Reset string </source>
-        <translation type="unfinished"></translation>
+        <translation>Zurücksetzzeichenfolge</translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
-        <translation type="unfinished"></translation>
+        <translation>Wählpräfix #1</translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
-        <translation type="unfinished"></translation>
+        <translation>Wählsuffix #1</translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
-        <translation type="unfinished"></translation>
+        <translation>Wählpräfix #2</translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
-        <translation type="unfinished"></translation>
+        <translation>Wählsuffix #2</translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
-        <translation type="unfinished"></translation>
+        <translation>Wählpräfix #3</translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
-        <translation type="unfinished"></translation>
+        <translation>Wählsuffix #3</translation>
     </message>
     <message>
         <source>Connect string </source>
-        <translation type="unfinished"></translation>
+        <translation>Zeichenkette bei
+Verbindung</translation>
     </message>
     <message>
         <source>Hang-up string </source>
-        <translation type="unfinished"></translation>
+        <translation>Auflegezeichenfolge</translation>
     </message>
     <message>
         <source>Dial time </source>
-        <translation type="unfinished"></translation>
+        <translation>Wähldauer</translation>
     </message>
     <message>
         <source>Delay before redial </source>
-        <translation type="unfinished"></translation>
+        <translation>Pause vor Neuanwahl</translation>
     </message>
     <message>
         <source>Number of tries </source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl der Versuche</translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
-        <translation type="unfinished"></translation>
+        <translation>DTR drop Zeit (0=keine)</translation>
     </message>
     <message>
         <source>Auto bps detect </source>
-        <translation type="unfinished"></translation>
+        <translation>Auto BPS Erkennung</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nein</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
-        <translation type="unfinished"></translation>
+        <translation>Modem hat eine DCD Leitung</translation>
     </message>
     <message>
         <source>Multi-line untag </source>
-        <translation type="unfinished"></translation>
+        <translation>Multi-line untag </translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerät</translation>
     </message>
     <message>
         <source>Or peer mac address</source>
-        <translation type="unfinished"></translation>
+        <translation>Oder mac Adresse des Partners</translation>
     </message>
 </context>
 <context>
     <name>ConfigDialog</name>
     <message>
         <source>Edit Connection Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindungsprofil bearbeiten</translation>
     </message>
     <message>
         <source>New Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Verbindung</translation>
     </message>
 </context>
 <context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfigurieren</translation>
     </message>
     <message>
         <source>Profile Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilname</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Löschen</translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
-        <translation type="unfinished"></translation>
+        <translation>Auszuführendes Kommando</translation>
     </message>
     <message>
         <source>Environment Variables</source>
-        <translation type="unfinished"></translation>
+        <translation>Umgebungsvariablen</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Wert</translation>
     </message>
     <message>
         <source>Name :</source>
-        <translation type="unfinished"></translation>
+        <translation>Name :</translation>
     </message>
     <message>
         <source>Value :</source>
-        <translation type="unfinished"></translation>
+        <translation>Wert :</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinzufügen</translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
-        <translation type="unfinished"></translation>
+        <translation>Telefonnummer eingeben</translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Zu wählende Telefonnummer eingeben. Bitte Ok drücken, wenn fertig</translation>
     </message>
 </context>
 <context>
     <name>EditBase</name>
     <message>
         <source>Editor Base</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor</translation>
     </message>
     <message>
         <source>Terminal Emulation:</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminal Emulation:</translation>
     </message>
     <message>
         <source>IO Layer:</source>
-        <translation type="unfinished"></translation>
+        <translation>IO Schicht:</translation>
     </message>
     <message>
         <source>Look</source>
-        <translation type="unfinished"></translation>
+        <translation>Aussehen</translation>
     </message>
     <message>
         <source>Foreground:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vordergrund:</translation>
     </message>
     <message>
         <source>Black</source>
-        <translation type="unfinished"></translation>
+        <translation>Schwarz</translation>
     </message>
     <message>
         <source>White</source>
-        <translation type="unfinished"></translation>
+        <translation>Weiß</translation>
     </message>
     <message>
         <source>Gray</source>
-        <translation type="unfinished"></translation>
+        <translation>Grau</translation>
     </message>
     <message>
         <source>Background:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hintergrund:</translation>
     </message>
     <message>
         <source>Font:</source>
-        <translation type="unfinished"></translation>
+        <translation>Schrift:</translation>
     </message>
     <message>
         <source>Micro</source>
-        <translation type="unfinished"></translation>
+        <translation>Winzig</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Klein</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Mittel</translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte nicht starten</translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte nicht gabeln</translation>
     </message>
     <message>
         <source>Could not start</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte nicht starten</translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
-        <translation type="unfinished"></translation>
+        <translation>Dimensionen</translation>
     </message>
     <message>
         <source>Edit Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlüssel bearbeiten</translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation>Geschwindigkeit</translation>
     </message>
     <message>
         <source>Flow control</source>
-        <translation type="unfinished"></translation>
+        <translation>Flusskontrolle</translation>
     </message>
     <message>
         <source>Hardware</source>
-        <translation type="unfinished"></translation>
+        <translation>Hardware</translation>
     </message>
     <message>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation>Software</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Keine</translation>
     </message>
     <message>
         <source>Parity</source>
-        <translation type="unfinished"></translation>
+        <translation>Parität</translation>
     </message>
     <message>
         <source>Odd</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungerade</translation>
     </message>
     <message>
         <source>Even</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerade</translation>
     </message>
     <message>
         <source>Data Bits</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten Bits</translation>
     </message>
     <message>
         <source>5</source>
-        <translation type="unfinished"></translation>
+        <translation>5</translation>
     </message>
     <message>
         <source>6</source>
-        <translation type="unfinished"></translation>
+        <translation>6</translation>
     </message>
     <message>
         <source>7</source>
-        <translation type="unfinished"></translation>
+        <translation>7</translation>
     </message>
     <message>
         <source>8</source>
-        <translation type="unfinished"></translation>
+        <translation>8</translation>
     </message>
     <message>
         <source>Stop Bits</source>
-        <translation type="unfinished"></translation>
+        <translation>Stopp Bits</translation>
     </message>
     <message>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <source>1.5</source>
-        <translation type="unfinished"></translation>
+        <translation>1,5</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
     <message>
         <source>115200 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>115200 baud</translation>
     </message>
     <message>
         <source>57600 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>57600 baud</translation>
     </message>
     <message>
         <source>38400 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>38400 baud</translation>
     </message>
     <message>
         <source>19200 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>19200 baud</translation>
     </message>
     <message>
         <source>9600 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>9600 baud</translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht verbunden</translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültige Baudrate</translation>
     </message>
     <message>
         <source>Device is already connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerät ist bereits verbunden</translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerät</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Profile konfigurieren</translation>
     </message>
     <message>
         <source>New Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Verbindung</translation>
     </message>
     <message>
         <source>Save Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung speichern</translation>
     </message>
     <message>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbinden</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Auflegen</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
-        <translation type="unfinished"></translation>
+        <translation>SchnellStart</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Shell Knopf lädt das &quot;default&quot; Profil. Wenn es keines gibt, werden Standardwerte genommen</translation>
     </message>
     <message>
         <source>Transfer file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei übertragen...</translation>
     </message>
     <message>
         <source>Line wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>Full screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Vollbild</translation>
     </message>
     <message>
         <source>Save history</source>
-        <translation type="unfinished"></translation>
+        <translation>Historie speichern</translation>
     </message>
     <message>
         <source>Terminate</source>
-        <translation type="unfinished"></translation>
+        <translation>Beenden</translation>
     </message>
     <message>
         <source>Close Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Fenster schließen</translation>
     </message>
     <message>
         <source>Run Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Skript ausführen</translation>
     </message>
     <message>
         <source>Record Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Skript aufnehmen</translation>
     </message>
     <message>
         <source>Save Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Skript speichern</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
-        <translation type="unfinished"></translation>
+        <translation>Tastatur öffnen...</translation>
     </message>
     <message>
         <source>New from Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Neu aus Profil</translation>
     </message>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung</translation>
     </message>
     <message>
         <source>Scripts</source>
-        <translation type="unfinished"></translation>
+        <translation>Skripte</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopieren</translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfügen</translation>
     </message>
     <message>
         <source>Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Skript</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Es gibt keine Verbindung.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
-        <translation type="unfinished"></translation>
+        <translation>Historie</translation>
     </message>
     <message>
         <source>New Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Neues Profil</translation>
     </message>
     <message>
         <source>Save Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil speichern</translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem ist angeschlossen an:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
-        <translation type="unfinished"></translation>
+        <translation>Telefonnummer hier eingeben:</translation>
     </message>
     <message>
         <source>AT commands</source>
-        <translation type="unfinished"></translation>
+        <translation>AT Kommandos</translation>
     </message>
     <message>
         <source>Enter number</source>
-        <translation type="unfinished"></translation>
+        <translation>Nummer</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
-        <translation type="unfinished"></translation>
+        <translation>Dieser Einschub unterstützt keine Konfiguration</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung</translation>
     </message>
     <message>
         <source>Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisch verbinden nach dem Laden</translation>
     </message>
     <message>
         <source>Local Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokale Konsole</translation>
     </message>
     <message>
         <source>New Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Neues Profil</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Konsole</translation>
     </message>
     <message>
         <source>Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlgeschlagen</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung für diese Sitzung fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Session failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Sitzung fehlgeschlagen</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Kann Sitzung nicht öffnen: Nicht alle Komponenten wurden gefunden.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Übertragungsmodus</translation>
     </message>
     <message>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation>Senden</translation>
     </message>
     <message>
         <source>Receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfangen</translation>
     </message>
     <message>
         <source>Send file</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei senden</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
-        <translation type="unfinished"></translation>
+        <translation>Übertragungsprotokoll</translation>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Fortschritt</translation>
     </message>
     <message>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Status</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation type="unfinished"></translation>
+        <translation>Fertig</translation>
     </message>
     <message>
         <source>Start transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Übertragung starten</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbruch</translation>
     </message>
     <message>
         <source>File transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateiübertragung</translation>
     </message>
     <message>
         <source>Attention</source>
-        <translation type="unfinished"></translation>
+        <translation>Achtung</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es wurde keine Datei angegeben.</translation>
     </message>
     <message>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>Sende...</translation>
     </message>
     <message>
         <source>Receiving...</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfange...</translation>
     </message>
     <message>
         <source>Cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation>Abgebrochen</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Dateiübertragung wurde abgebrochen.</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Operation nicht unterstützt.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation>Übertragung konnte nicht gestartet werden.</translation>
     </message>
     <message>
         <source>No error.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kein Fehler.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Undefinierter Fehler aufgetreten.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unvollständige Übertragung.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannter Fehler aufgetreten.</translation>
     </message>
     <message>
         <source>Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesendet</translation>
     </message>
     <message>
         <source>File has been sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei wurde gesendet.</translation>
     </message>
     <message>
         <source>Received</source>
-        <translation type="unfinished"></translation>
+        <translation>Empfangen</translation>
     </message>
     <message>
         <source>File has been received.</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei wurde empfangen.</translation>
     </message>
     <message>
         <source>Profile name</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilname</translation>
     </message>
     <message>
         <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung</translation>
     </message>
     <message>
         <source>Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Spezial Einstellungen</translation>
     </message>
     <message>
         <source>Invalid profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültiges Profil</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte einen Profilnamen eingeben.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
-        <translation type="unfinished"></translation>
+        <translation>Seriell</translation>
     </message>
     <message>
         <source>Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokale Konsole</translation>
     </message>
     <message>
         <source>Default Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardterminal</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Standardtastatur</translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
-        <translation type="unfinished"></translation>
+        <translation>SynchronisierteDatei</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle Nummer: %1</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlschlag</translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nummer wählen fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
-        <translation type="unfinished"></translation>
+        <translation>Breche ab...</translation>
     </message>
     <message>
         <source>Searching modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Suche Modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
-        <translation type="unfinished"></translation>
+        <translation>Initialisierung...</translation>
     </message>
     <message>
         <source>Reset speakers</source>
-        <translation type="unfinished"></translation>
+        <translation>Lautsprecher zurücksetzen</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
-        <translation type="unfinished"></translation>
+        <translation>Schalte Wählton ab</translation>
     </message>
     <message>
         <source>Dial number</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle Nummer</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
-        <translation type="unfinished"></translation>
+        <translation>Besetzt, wähle Nummer erneut</translation>
     </message>
     <message>
         <source>Connection established</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung aufgebaut</translation>
     </message>
     <message>
         <source>Dismiss</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufgeben</translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerät</translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminal Typ</translation>
     </message>
     <message>
         <source>Color scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbschema</translation>
     </message>
     <message>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation>Schriftgröße</translation>
     </message>
     <message>
         <source>small</source>
-        <translation type="unfinished"></translation>
+        <translation>klein</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation type="unfinished"></translation>
+        <translation>mittel</translation>
     </message>
     <message>
         <source>large</source>
-        <translation type="unfinished"></translation>
+        <translation>groß</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeilenumbruchskonvertierung</translation>
     </message>
     <message>
         <source>Inbound</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingang</translation>
     </message>
     <message>
         <source>Outbound</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgang</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Optionen</translation>
     </message>
     <message>
         <source>Local echo</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokales Echo</translation>
     </message>
     <message>
         <source>Line wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>VT 100</source>
-        <translation type="unfinished"></translation>
+        <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
-        <translation type="unfinished"></translation>
+        <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Linux Konsole</translation>
     </message>
     <message>
         <source>X-Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>X-Terminal</translation>
     </message>
     <message>
         <source>black on white</source>
-        <translation type="unfinished"></translation>
+        <translation>schwarz auf weiß</translation>
     </message>
     <message>
         <source>white on black</source>
-        <translation type="unfinished"></translation>
+        <translation>weiß auf schwarz</translation>
     </message>
     <message>
         <source>green on black</source>
-        <translation type="unfinished"></translation>
+        <translation>grün auf schwarz</translation>
     </message>
     <message>
         <source>orange on black</source>
-        <translation type="unfinished"></translation>
+        <translation>orange auf schwarz</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/opie-write.ts b/i18n/de/opie-write.ts
index be81c52..d6a827f 100644
--- a/i18n/de/opie-write.ts
+++ b/i18n/de/opie-write.ts
@@ -1,116 +1,117 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editieren</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnen</translation>
     </message>
     <message>
         <source>Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>Rückgängig</translation>
     </message>
     <message>
         <source>Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiederherstellen</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopieren</translation>
     </message>
     <message>
         <source>Cut</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausschneiden</translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfügen</translation>
     </message>
     <message>
         <source>Bold</source>
-        <translation type="unfinished"></translation>
+        <translation>Fett</translation>
     </message>
     <message>
         <source>Italic</source>
-        <translation type="unfinished"></translation>
+        <translation>Schräg</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kursiv</translation>
     </message>
     <message>
         <source>Underline</source>
-        <translation type="unfinished"></translation>
+        <translation>Unterstrichen</translation>
     </message>
     <message>
         <source>&amp;Underline</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Unterstrichen</translation>
     </message>
     <message>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Links</translation>
     </message>
     <message>
         <source>Center</source>
-        <translation type="unfinished"></translation>
+        <translation>Zentriert</translation>
     </message>
     <message>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechts</translation>
     </message>
     <message>
         <source>Full</source>
-        <translation type="unfinished"></translation>
+        <translation>Block</translation>
     </message>
     <message>
         <source>Rich Text Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Rich Text Editor</translation>
     </message>
     <message>
         <source>Unnamed</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbenannt</translation>
     </message>
 </context>
 <context>
     <name>QTextEdit</name>
     <message>
         <source>&amp;Undo</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rückgängig</translation>
     </message>
     <message>
         <source>&amp;Redo</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wiederherstellen</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <source>Select All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alles auswählen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/opieftp.ts b/i18n/de/opieftp.ts
index 3a9acf5..fae7058 100644
--- a/i18n/de/opieftp.ts
+++ b/i18n/de/opieftp.ts
@@ -240,5 +240,9 @@ It must be empty</source>
         <source>Sorry name already taken</source>
         <translation>Bedaure, der Name wird bereits verwendet.</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation>Hinzu</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/opieirc.ts b/i18n/de/opieirc.ts
index 063f42b..90d17c0 100644
--- a/i18n/de/opieirc.ts
+++ b/i18n/de/opieirc.ts
@@ -1,4 +1,5 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>IRCChannelTab</name>
     <message>
@@ -7,484 +8,486 @@
     </message>
     <message>
         <source>Channel discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal Diskussion</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie Ihre Nachricht hier ein, um an der Kanaldiskussion teizunehmen</translation>
     </message>
     <message>
         <source>CTCP</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP</translation>
     </message>
     <message>
         <source>Query</source>
-        <translation type="unfinished"></translation>
+        <translation>Abfrage</translation>
     </message>
     <message>
         <source>Ping</source>
-        <translation type="unfinished"></translation>
+        <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation>Version</translation>
     </message>
     <message>
         <source>Whois</source>
-        <translation type="unfinished"></translation>
+        <translation>WerIst</translation>
     </message>
     <message>
         <source>Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindungsabbruch</translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbunden, melde mich an..</translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erfolgreich angemeldet.</translation>
     </message>
     <message>
         <source>Socket error : </source>
-        <translation type="unfinished"></translation>
+        <translation>Socket Fehler:</translation>
     </message>
     <message>
         <source>Connection closed</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung geschlossen</translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Beitritt zu nicht existierenden Kanal - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Person has already joined the channel - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Person Kanal bereits beigetreten - unsynchronisiert?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Du bist dem Kanal bereits beigetreten - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Parting person not found - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Scheidende Person nicht gefunden - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Zu verlassenden Kanal nicht gefunden - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanalnachricht mit unbekanntem Absender</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
-        <translation type="unfinished"></translation>
+        <translation>PRIVMSG von unbekanntem Typ erhalten</translation>
     </message>
     <message>
         <source>Nickname change of an unknown person</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitznamen Änderung einer unbekannten Person</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannte Person gegangen - unsynchronisiert?</translation>
     </message>
     <message>
         <source> changed topic to </source>
-        <translation type="unfinished"></translation>
+        <translation>Thema geändert auf</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekanntes Kanalthema - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP PING erhalten von </translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP VERSION erhalten von </translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP ACTION mit unbekannter Person - unsynchronisiert?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP ACTION mit unbekanntem Kanal - unsynchronisiert?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
-        <translation type="unfinished"></translation>
+        <translation>CTCP ACTION mit schlechtem Empfänger</translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
-        <translation type="unfinished"></translation>
+        <translation>Moduswechsel hat einen unbekannten Typ</translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Moduswechsel mit unbekannter Person - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
-        <translation type="unfinished"></translation>
+        <translation>Moduswechsel hat ein unbekanntes Flag</translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Moduswechsel mit unbekanntem Kanal - unsynchronisiert?</translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzermodi noch nicht unterstützt</translation>
     </message>
     <message>
         <source>You were kicked from </source>
-        <translation type="unfinished"></translation>
+        <translation>Du bist rausgeworfen worden aus</translation>
     </message>
     <message>
         <source> by </source>
-        <translation type="unfinished"></translation>
+        <translation>von</translation>
     </message>
     <message>
         <source> was kicked from </source>
-        <translation type="unfinished"></translation>
+        <translation>wurde rausgeworfen aus</translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannte Person rausgeworfen - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannter Kanal rausgeworfen - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Servernachricht mit unbekanntem Kanal</translation>
     </message>
     <message>
         <source>You joined channel </source>
-        <translation type="unfinished"></translation>
+        <translation>Du bist folgendem Kanal beigetreten</translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitzname bereits vergeben, bitte mit einem anderen neu verbinden</translation>
     </message>
     <message>
         <source>No such nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Es gibt keinen solchen Spitznamen</translation>
     </message>
     <message>
         <source>Received unhandled numeric command: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbehandeltes numerisches Kommando erhalten: %1</translation>
     </message>
     <message>
         <source>Received unhandled ctcp command: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbehandeltes ctcp Kommando erhalten: %1</translation>
     </message>
     <message>
         <source>Received unhandled literal command: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbehandeltes buchstäbliches Kommando erhalten: %1</translation>
     </message>
     <message>
         <source>%1 joined channel %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 betrat Kanal %2</translation>
     </message>
     <message>
         <source>You left channel %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Du hast Kanal %1 verlassen</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 verließ Kanal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanalnachricht mit unbekanntem Kanal %1</translation>
     </message>
     <message>
         <source>You are now known as %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Du bis nun als %1 bekannt</translation>
     </message>
     <message>
         <source>%1 is now known as %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 ist nun bekannt als %2</translation>
     </message>
     <message>
         <source>%1 has quit (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 beendete (%2)</translation>
     </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
     <message>
         <source>Talking to </source>
-        <translation type="unfinished"></translation>
+        <translation>Spreche zu</translation>
     </message>
     <message>
         <source>Private discussion</source>
-        <translation type="unfinished"></translation>
+        <translation>Private Diskussion</translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie Ihren Text hier ein, um eine Nachricht an die andere Person zu schicken</translation>
     </message>
     <message>
         <source>Disconnected</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung getrennt</translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilname:</translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Name dieses Serverprofils im Überblick</translation>
     </message>
     <message>
         <source>Hostname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostname:</translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
-        <translation type="unfinished"></translation>
+        <translation>Servername, mit dem verbunden werden soll - kann ein gültiger Hostname oder eine IP Adresse sein</translation>
     </message>
     <message>
         <source>Port :</source>
-        <translation type="unfinished"></translation>
+        <translation>Port:</translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
-        <translation type="unfinished"></translation>
+        <translation>Der Serverport, mit dem verbunden werden soll. Normaler Weise 6667</translation>
     </message>
     <message>
         <source>Nickname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitzname:</translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
-        <translation type="unfinished"></translation>
+        <translation>Dein Spitzname im IRC Netzwerk</translation>
     </message>
     <message>
         <source>Realname :</source>
-        <translation type="unfinished"></translation>
+        <translation>Echter Name:</translation>
     </message>
     <message>
         <source>Your real name</source>
-        <translation type="unfinished"></translation>
+        <translation>Dein echter Name</translation>
     </message>
     <message>
         <source>Password :</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort:</translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort, um mit dem Server zu verbinden (wenn benötigt)</translation>
     </message>
     <message>
         <source>Channels :</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanäle:</translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Komma-separierte Liste aller Kanäle, denen Du automatisch beitreten möchtest</translation>
     </message>
     <message>
         <source>Edit server information</source>
-        <translation type="unfinished"></translation>
+        <translation>Server Information bearbeiten</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <source>Profile name required</source>
-        <translation type="unfinished"></translation>
+        <translation>Profilname benötigt</translation>
     </message>
     <message>
         <source>Host name required</source>
-        <translation type="unfinished"></translation>
+        <translation>Hostname benötigt</translation>
     </message>
     <message>
         <source>Port required</source>
-        <translation type="unfinished"></translation>
+        <translation>Port benötigt</translation>
     </message>
     <message>
         <source>Nickname required</source>
-        <translation type="unfinished"></translation>
+        <translation>Spitzname benötigt</translation>
     </message>
     <message>
         <source>Realname required</source>
-        <translation type="unfinished"></translation>
+        <translation>Echter Name benötigt</translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Kanalliste muss eine Komma-
+separierte Liste von Kanalnamen
+enthalten, die mit &apos;#&apos; oder &apos;+&apos; anfangen</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
-        <translation type="unfinished"></translation>
+        <translation>Serverliste</translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte wähle ein Serverprofil</translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte Serverprofil aus der Liste auswählen, dann OK oben rechts anklicken</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Das aktuell gewählte Serverprofil löschen</translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Das aktuell gewählte Serverprofil bearbeiten</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Neues Serverprofil hinzufügen</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
-        <translation type="unfinished"></translation>
+        <translation>Verbindung mit</translation>
     </message>
     <message>
         <source>Server messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Server Nachrichten</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
-        <translation type="unfinished"></translation>
+        <translation>Kommandos hier eingeben. Eine Liste verfügbarer Kommandos findet man in der OpieIRC Hilfe</translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
-        <translation type="unfinished"></translation>
+        <translation>Dargestellte Zeilen:</translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeilenanzahl, die dargestellt werden bevor alte Zeilen gelöscht werden - dies ist nötig um den Speicherverbrauch zu begrenzen. Setze 0, wenn Du das nicht brauchst</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Generell</translation>
     </message>
     <message>
         <source>Background color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Hintergrundsfarbe :</translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
-        <translation type="unfinished"></translation>
+        <translation>Im Chat benutzte Hintergrundsfarbe</translation>
     </message>
     <message>
         <source>Normal text color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Normale Textfarbe:</translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
-        <translation type="unfinished"></translation>
+        <translation>Im Chat benutzte Textfarbe</translation>
     </message>
     <message>
         <source>Error color :</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler Farbe:</translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
-        <translation type="unfinished"></translation>
+        <translation>Textfarbe, die benutzt wird, um Fehlermeldungen darzustellen</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
-        <translation type="unfinished"></translation>
+        <translation>Von Dir geschriebener Text:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
-        <translation type="unfinished"></translation>
+        <translation>Textfarbe, die von Dir geschriebenen Text identifiziert</translation>
     </message>
     <message>
         <source>Text written by others :</source>
-        <translation type="unfinished"></translation>
+        <translation>Von anderen geschriebener Text:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
-        <translation type="unfinished"></translation>
+        <translation>Textfarbe, die von anderen geschriebenen Text identifiziert</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
-        <translation type="unfinished"></translation>
+        <translation>Vom Server geschriebener Text:</translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Textfarbe, die vom Server geschriebenen Text identifiziert</translation>
     </message>
     <message>
         <source>Notifications :</source>
-        <translation type="unfinished"></translation>
+        <translation>Benachrichtigungen:</translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
-        <translation type="unfinished"></translation>
+        <translation>Textfarbe, die benutzt wird, um Benachrichtigungen darzustellen</translation>
     </message>
     <message>
         <source>Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Farben</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">Einstellungen</translation>
+        <translation>Einstellungen</translation>
     </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehlende Beschreibung</translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
-        <translation type="unfinished"></translation>
+        <translation>Inhaltsbeschreibung dieses Reiters</translation>
     </message>
     <message>
         <source>Close this tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiter schließen</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
-        <translation>IRC Klient</translation>
+        <translation>IRC Anwendung</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
diff --git a/i18n/de/opieplayer.ts b/i18n/de/opieplayer.ts
index 862024b..7d78850 100644
--- a/i18n/de/opieplayer.ts
+++ b/i18n/de/opieplayer.ts
@@ -90,168 +90,169 @@ Der Player wird beendet.</translation>
     <name>PlayListWidget</name>
     <message>
         <source>OpiePlayer</source>
-        <translation type="unfinished">OpiePlayer</translation>
+        <translation>OpiePlayer</translation>
     </message>
     <message>
         <source>Play Operations</source>
-        <translation type="unfinished"></translation>
+        <translation>Abspieloperationen</translation>
     </message>
     <message>
         <source>Add to Playlist</source>
-        <translation type="unfinished"></translation>
+        <translation>Zur Abspielliste hinzu</translation>
     </message>
     <message>
         <source>Remove from Playlist</source>
-        <translation type="unfinished"></translation>
+        <translation>Aus Abspielliste löschen</translation>
     </message>
     <message>
         <source>Play</source>
-        <translation type="unfinished"></translation>
+        <translation>Abspielen</translation>
     </message>
     <message>
         <source>Randomize</source>
-        <translation type="unfinished"></translation>
+        <translation>Zufällig</translation>
     </message>
     <message>
         <source>Loop</source>
-        <translation type="unfinished"></translation>
+        <translation>Schleife</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei</translation>
     </message>
     <message>
         <source>Clear List</source>
-        <translation type="unfinished"></translation>
+        <translation>Liste leeren</translation>
     </message>
     <message>
         <source>Add all audio files</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Tondateien hinzu</translation>
     </message>
     <message>
         <source>Add all video files</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Videodateien hinzu</translation>
     </message>
     <message>
         <source>Add all files</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Dateien hinzu</translation>
     </message>
     <message>
         <source>Save PlayList</source>
-        <translation type="unfinished"></translation>
+        <translation>Abspielliste speichern</translation>
     </message>
     <message>
         <source>Open File or URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei oder URL öffnen</translation>
     </message>
     <message>
         <source>Rescan for Audio Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Nach Tondateien suchen</translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Nach Videodateien suchen</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Ansicht</translation>
     </message>
     <message>
         <source>Full Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Vollbild</translation>
     </message>
     <message>
         <source>Scale</source>
-        <translation type="unfinished"></translation>
+        <translation>Skalieren</translation>
     </message>
     <message>
         <source>Move Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Nach oben</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernen</translation>
     </message>
     <message>
         <source>Move Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Nach unten</translation>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Titel</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Größe</translation>
     </message>
     <message>
         <source>Media</source>
-        <translation type="unfinished"></translation>
+        <translation>Median</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Ton</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation type="unfinished"></translation>
+        <translation>Video</translation>
     </message>
     <message>
         <source>Lists</source>
-        <translation type="unfinished"></translation>
+        <translation>Listen</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
-        <translation type="unfinished"></translation>
+        <translation>OpiePlayer:</translation>
     </message>
     <message>
         <source>Invalid File</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültige Datei</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Es gab ein Problem beim Datei holen.</translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
-        <translation type="unfinished"></translation>
+        <translation>Abspielliste löschen?</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wollen Sie diese Abspielliste
+wirklich löschen?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nein</translation>
     </message>
     <message>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Eigenschaften</translation>
     </message>
     <message>
         <source>Play Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Gewählte abspielen</translation>
     </message>
     <message>
         <source>Open file or URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei oder URL öffnen</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
-        <translation type="unfinished"></translation>
+        <translation>m3u Abspielliste speichern</translation>
     </message>
     <message>
         <source>Skins</source>
-        <translation type="unfinished"></translation>
+        <translation>Skins</translation>
     </message>
     <message>
         <source>Path</source>
-        <translation type="unfinished"></translation>
+        <translation>Pfad</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/opierec.ts b/i18n/de/opierec.ts
index 7f32700..5431db3 100644
--- a/i18n/de/opierec.ts
+++ b/i18n/de/opierec.ts
@@ -1,208 +1,213 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>Backward</source>
-        <translation type="unfinished"></translation>
+        <translation>Rückwärts</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorwärts</translation>
     </message>
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
-        <translation type="unfinished"></translation>
+        <translation>OpieRecord</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeit</translation>
     </message>
     <message>
         <source>Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Dateien</translation>
     </message>
     <message>
         <source>Sample Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Sampling Rate</translation>
     </message>
     <message>
         <source>44100</source>
-        <translation type="unfinished"></translation>
+        <translation>44100</translation>
     </message>
     <message>
         <source>32000</source>
-        <translation type="unfinished"></translation>
+        <translation>32000</translation>
     </message>
     <message>
         <source>22050</source>
-        <translation type="unfinished"></translation>
+        <translation>22050</translation>
     </message>
     <message>
         <source>16000</source>
-        <translation type="unfinished"></translation>
+        <translation>16000</translation>
     </message>
     <message>
         <source>11025</source>
-        <translation type="unfinished"></translation>
+        <translation>11025</translation>
     </message>
     <message>
         <source>8000</source>
-        <translation type="unfinished"></translation>
+        <translation>8000</translation>
     </message>
     <message>
         <source>Limit Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Größe begrenzen</translation>
     </message>
     <message>
         <source>Unlimited</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbegrenzt</translation>
     </message>
     <message>
         <source>File Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei Verzeichnis</translation>
     </message>
     <message>
         <source>Bit Depth</source>
-        <translation type="unfinished"></translation>
+        <translation>Bit Tiefe</translation>
     </message>
     <message>
         <source>16</source>
-        <translation type="unfinished"></translation>
+        <translation>16</translation>
     </message>
     <message>
         <source>8</source>
-        <translation type="unfinished"></translation>
+        <translation>8</translation>
     </message>
     <message>
         <source>In</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinein</translation>
     </message>
     <message>
         <source>Out</source>
-        <translation type="unfinished"></translation>
+        <translation>Hinaus</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Optionen</translation>
     </message>
     <message>
         <source>Volume</source>
-        <translation type="unfinished"></translation>
+        <translation>Lautstärke</translation>
     </message>
     <message>
         <source>Low Disk Space</source>
-        <translation type="unfinished"></translation>
+        <translation>Geringer Plattenplatz</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufnahmeplatz wird 
+knapp oder eine Karte 
+wurde nicht erkannt</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Sekunden</translation>
     </message>
     <message>
         <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
 the selected file?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wollen Sie wirklich die ausgewählte
+Datei &lt;font size=+2&gt;&lt;B&gt;LÖSCHEN&lt;/B&gt;&lt;/font&gt;?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nein</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte Datei nicht löschen.</translation>
     </message>
     <message>
         <source>Opierec</source>
-        <translation type="unfinished"></translation>
+        <translation>Opierec</translation>
     </message>
     <message>
         <source>Please select file to  play</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte zu spielende Datei auswählen</translation>
     </message>
     <message>
         <source>Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Notiz</translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Konnte Tondatei nicht öffnen.
+</translation>
     </message>
     <message>
         <source>Play</source>
-        <translation type="unfinished"></translation>
+        <translation>Apspielen</translation>
     </message>
     <message>
         <source>Send with Ir</source>
-        <translation type="unfinished"></translation>
+        <translation>Über IR senden</translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Umbenennen</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
-        <translation type="unfinished"></translation>
+        <translation>IR Übertragung</translation>
     </message>
     <message>
         <source>Ir sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>IR übertragen.</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Rec</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufn</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation type="unfinished"></translation>
+        <translation>Ort</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Datum</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
-        <translation type="unfinished"></translation>
+        <translation>Wave Komprimierung (kleinere Dateien)</translation>
     </message>
     <message>
         <source>auto Mute</source>
-        <translation type="unfinished"></translation>
+        <translation>auto still</translation>
     </message>
     <message>
         <source>mute</source>
-        <translation type="unfinished"></translation>
+        <translation>still</translation>
     </message>
     <message>
         <source>Stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Stopp</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/qpe.ts b/i18n/de/qpe.ts
index fbba2d8..91a91f9 100644
--- a/i18n/de/qpe.ts
+++ b/i18n/de/qpe.ts
@@ -1,79 +1,114 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>AppMonitor</name>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation>Sprache</translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation>Zeit und Datum</translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation>Persönliche Informationen</translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Anwendungsproblem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%q antwortet nicht.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;%1 antwortet nicht.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Möchten Sie die Anwendung abbrechen ?&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Möchten Sie die Anwendung abbrechen?&lt;/p&gt;</translation>
     </message>
-</context>
-<context>
-    <name>Calibrate</name>
     <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation>Berühren Sie mit dem Stift die Kreuze auf dem Schirm so, wie Sie normalerweise Ihr Gerät bedienen um den Schirm zu kalibrieren.</translation>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;&lt;p&gt;Schnellladen wurde für diese Anwendung ausgeschaltet. Tippen sie lange auf das Anwendungssymbol, um es wieder anzuschalten.&lt;/qt&gt;</translation>
     </message>
     <message>
-        <source>Welcome to Opie</source>
-        <translation>Willkommen bei Opie</translation>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; wurde mit Signalcode %2 beendet&lt;/qt&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
     <message>
-        <source>Documents</source>
-        <translation>Dokumente</translation>
+        <source>Application terminated</source>
+        <translation>Anwendung beendet</translation>
     </message>
     <message>
-        <source>Icon View</source>
-        <translation>Icon-Ansicht</translation>
+        <source>Application not found</source>
+        <translation>Anwendung nicht gefunden</translation>
     </message>
     <message>
-        <source>List View</source>
-        <translation>Listenansicht</translation>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Konnte Anwendung &lt;b&gt;%1&lt;/b&gt; nicht finden&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Konnte die Anwendung %1 nicht finden&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
-    <name>DesktopApplication</name>
+    <name>DesktopPowerAlerter</name>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation>Der Batteriestatus ist kritisch!
-Schließen Sie das Gerät schnellst 
-möglich an die Stromversorgung an!</translation>
+        <source>Battery Status</source>
+        <translation>Batteriestatus</translation>
     </message>
     <message>
-        <source>Battery is running very low.</source>
-        <translation>Der Batteristatus ist sehr niedrig.</translation>
+        <source>Low Battery</source>
+        <translation>Geringe Batteriestärke</translation>
     </message>
+</context>
+<context>
+    <name>FirstUse</name>
     <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation>Die Ersatzbatterie ist schwach.
-Bitte laden Sie sie auf.</translation>
+        <source>&lt;&lt; Back</source>
+        <translation>&lt;&lt; Zurück</translation>
     </message>
     <message>
-        <source>business card</source>
-        <translation>Visitenkarte</translation>
+        <source>Next &gt;&gt;</source>
+        <translation>Weiter &gt;&gt;</translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation>Information</translation>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation>Berühren Sie den Bildschirm irgendwo, um weiter zu machen.</translation>
     </message>
     <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation>&lt;p&lt;Das Systemdatum scheint nicht gültig zu sein.
-(%1)&lt;/p&gt;&lt;p&gt;Möchten Sie es anpassen ?&lt;/p&gt;</translation>
+        <source>Please wait, loading %1 settings.</source>
+        <translation>Bitte warten, lade %1 Einstellungen.</translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation>Bitte warten...</translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation>ErstBenutzungsHintergrund</translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation>Fertig</translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation>Unicode</translation>
     </message>
 </context>
 <context>
@@ -95,90 +130,129 @@ Bitte laden Sie sie auf.</translation>
         <translation>&lt;p&gt;Es ist keine Anwendung für dieses Dokument des Typs %1 definiert&lt;/p&gt;.</translation>
     </message>
     <message>
-        <source>Finding documents</source>
-        <translation>Dokumente finden</translation>
+        <source>Documents</source>
+        <translation>Dokumente</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <source>Searching documents</source>
-        <translation>Dokumente suchen</translation>
+        <source>View as text</source>
+        <translation>Als Text betrachten</translation>
     </message>
 </context>
 <context>
-    <name>LauncherView</name>
+    <name>LauncherTabWidget</name>
     <message>
-        <source>%1 files</source>
-        <translation>%1 Dateien</translation>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Finde Dokumente...&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation>Symbol-Ansicht</translation>
     </message>
     <message>
-        <source>All types of file</source>
-        <translation>Alle Dateien</translation>
+        <source>List View</source>
+        <translation>Listenansicht</translation>
     </message>
+</context>
+<context>
+    <name>LauncherView</name>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
+    <message>
+        <source>All types</source>
+        <translation>Alle Typen</translation>
+    </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation>Sicherer Modus</translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation>Plugin Manager...</translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation>Qtopia neu starten</translation>
+    </message>
     <message>
-        <source>Medium inserted</source>
-        <translation>Neues Medium eingelegt</translation>
+        <source>Help...</source>
+        <translation>Hilfe...</translation>
     </message>
+</context>
+<context>
+    <name>ServerApplication</name>
     <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>Ein &lt;b&gt;neues Medium&lt;/b&gt; wurde eingelegt. 
-Soll es nach neuen Dokumenten durchsucht werden ?</translation>
+        <source>Information</source>
+        <translation>Information</translation>
     </message>
     <message>
-        <source>Which media files</source>
-        <translation>Dokumentenauswahl</translation>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Das Systemdatum scheint nicht gültig zu sein.
+(%1)&lt;/p&gt;&lt;p&gt;Möchten Sie es anpassen?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Audio</source>
-        <translation>Audio</translation>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation>Der Batteriestatus ist kritisch!
+Schließen Sie das Gerät schnellst 
+möglich an die Stromversorgung an!</translation>
     </message>
     <message>
-        <source>Image</source>
-        <translation>Bilder</translation>
+        <source>Battery is running very low. </source>
+        <translation>Batterie nahezu erschöpft.</translation>
     </message>
     <message>
-        <source>Text</source>
-        <translation>Texte</translation>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation>Die Ersatzbatterie ist schwach.
+Bitte laden Sie sie auf.</translation>
     </message>
     <message>
-        <source>Video</source>
-        <translation>Videos</translation>
+        <source>business card</source>
+        <translation>Visitenkarte</translation>
     </message>
     <message>
-        <source>All</source>
-        <translation>Alles</translation>
+        <source>Safe Mode</source>
+        <translation>Sicherer  Modus</translation>
     </message>
     <message>
-        <source>Link apps</source>
-        <translation>Anwendungen verlinken</translation>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation>&lt;P&gt;Es trat ein Fehler beim Systemstart ein, das System ist nun im sicheren Modus. Plugins wurden nicht geladen. Sie können die kritischen Plugins im Plugin Manager ausschalten.</translation>
     </message>
     <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation>Auf folgendes Verzeichnis begrenzen: (unbenutzt)</translation>
+        <source>OK</source>
+        <translation>OK</translation>
     </message>
     <message>
-        <source>Add</source>
-        <translation>Neu</translation>
+        <source>Plugin Manager...</source>
+        <translation>Plugin Manager...</translation>
     </message>
     <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation>Auswahl auf dem Medium speichern</translation>
+        <source>Memory Status</source>
+        <translation>Speicher Status</translation>
     </message>
     <message>
-        <source>Do not ask again for this medium</source>
-        <translation>Dieses Medium nie mehr nachfragen</translation>
+        <source>Memory Low
+Please save data.</source>
+        <translation>Knapper Speicher
+Bitte Daten sichern.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Battery Status</source>
-        <translation>Batteriestatus</translation>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation>Kritische Speicherknappheit
+Bitte diese Anwendung 
+sofort beenden.</translation>
     </message>
 </context>
 <context>
@@ -243,16 +317,12 @@ These termination options are provided primarily for use while developing and te
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation>Synchronisieren</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Adressen&lt;/b&gt;</translation>
+        <source>Abort</source>
+        <translation>Abbruch</translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Abbrechen</translation>
+        <source>Syncing:</source>
+        <translation>Synchronisiere:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/reader.ts b/i18n/de/reader.ts
index 0bf3ce2..d416c44 100644
--- a/i18n/de/reader.ts
+++ b/i18n/de/reader.ts
@@ -4,7 +4,7 @@
     <name>CBarPrefs</name>
     <message>
         <source>Toolbar Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen Werkzeugleiste</translation>
     </message>
     <message>
         <source>File</source>
@@ -28,7 +28,7 @@
     </message>
     <message>
         <source>Policy</source>
-        <translation type="unfinished"></translation>
+        <translation>Strategie</translation>
     </message>
 </context>
 <context>
@@ -39,99 +39,99 @@
     </message>
     <message>
         <source>&lt;Nothing&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Nichts&gt;</translation>
     </message>
     <message>
         <source>Open file</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei öffnen</translation>
     </message>
     <message>
         <source>Autoscroll</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisches Blättern</translation>
     </message>
     <message>
         <source>Bookmark</source>
-        <translation type="unfinished">Lesezeichen</translation>
+        <translation>Lesezeichen</translation>
     </message>
     <message>
         <source>Annotate</source>
-        <translation type="unfinished">Anmerken</translation>
+        <translation>Anmerken</translation>
     </message>
     <message>
         <source>Fullscreen</source>
-        <translation type="unfinished">Vollbild</translation>
+        <translation>Vollbild</translation>
     </message>
     <message>
         <source>Zoom in</source>
-        <translation type="unfinished"></translation>
+        <translation>Vergrößern</translation>
     </message>
     <message>
         <source>Zoom out</source>
-        <translation type="unfinished"></translation>
+        <translation>Verkleinern</translation>
     </message>
     <message>
         <source>Back</source>
-        <translation type="unfinished">Zurück</translation>
+        <translation>Zurück</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished">Vorwärts</translation>
+        <translation>Vorwärts</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished">Home</translation>
+        <translation>Home</translation>
     </message>
     <message>
         <source>Page up</source>
-        <translation type="unfinished"></translation>
+        <translation>Seite hoch</translation>
     </message>
     <message>
         <source>Page down</source>
-        <translation type="unfinished"></translation>
+        <translation>Seite runter</translation>
     </message>
     <message>
         <source>Line up</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeile hoch</translation>
     </message>
     <message>
         <source>Line down</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeile runter</translation>
     </message>
     <message>
         <source>Beginning</source>
-        <translation type="unfinished"></translation>
+        <translation>Anfang</translation>
     </message>
     <message>
         <source>End</source>
-        <translation type="unfinished"></translation>
+        <translation>Ende</translation>
     </message>
     <message>
         <source>Escape Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbruch Taste</translation>
     </message>
     <message>
         <source>Space Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Leerzeichen Taste</translation>
     </message>
     <message>
         <source>Return Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Eingabetaste</translation>
     </message>
     <message>
         <source>Left Arrow</source>
-        <translation type="unfinished"></translation>
+        <translation>Pfeil links</translation>
     </message>
     <message>
         <source>Right Arrow</source>
-        <translation type="unfinished"></translation>
+        <translation>Pfeil rechts</translation>
     </message>
     <message>
         <source>Down Arrow</source>
-        <translation type="unfinished"></translation>
+        <translation>Pfeil runter</translation>
     </message>
     <message>
         <source>Up Arrow</source>
-        <translation type="unfinished"></translation>
+        <translation>Pfeil hoch</translation>
     </message>
 </context>
 <context>
@@ -170,7 +170,8 @@
     <message>
         <source>Two/One
 Touch</source>
-        <translation type="unfinished"></translation>
+        <translation>Zweifach/Einfach
+tippen</translation>
     </message>
     <message>
         <source>Find</source>
@@ -192,11 +193,11 @@ Touch</source>
     </message>
     <message>
         <source>Ideograms</source>
-        <translation type="unfinished"></translation>
+        <translation>Ideogramme</translation>
     </message>
     <message>
         <source>Ideogram Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Ideogramm Breite</translation>
     </message>
     <message>
         <source>Apply font
@@ -218,39 +219,41 @@ to dialogs</source>
     <message>
         <source>Two/One
 Touch</source>
-        <translation type="unfinished"></translation>
+        <translation>Zweifach/Einfach
+tippen</translation>
     </message>
     <message>
         <source>Dictionary</source>
-        <translation type="unfinished">Wörterbuch</translation>
+        <translation>Wörterbuch</translation>
     </message>
     <message>
         <source>Swap Tap
 Actions</source>
-        <translation type="unfinished"></translation>
+        <translation>Tippaktion
+vertauschen</translation>
     </message>
 </context>
 <context>
     <name>CLayoutPrefs</name>
     <message>
         <source>Strip CR</source>
-        <translation type="unfinished">CR entfernen</translation>
+        <translation>CR entfernen</translation>
     </message>
     <message>
         <source>Dehyphen</source>
-        <translation type="unfinished">ohne Bindestr. </translation>
+        <translation>ohne Bindestr</translation>
     </message>
     <message>
         <source>Single Space</source>
-        <translation type="unfinished">Einzelleerzeichen</translation>
+        <translation>Einzelleerzeichen</translation>
     </message>
     <message>
         <source>Unindent</source>
-        <translation type="unfinished">Nicht eingerückt</translation>
+        <translation>Nicht eingerückt</translation>
     </message>
     <message>
         <source>Reparagraph</source>
-        <translation type="unfinished"></translation>
+        <translation>Absätze ermitteln</translation>
     </message>
     <message>
         <source>Double Space</source>
@@ -266,46 +269,50 @@ Actions</source>
     </message>
     <message>
         <source>Full Justify</source>
-        <translation type="unfinished"></translation>
+        <translation>Voll ausrichten</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Text</translation>
     </message>
 </context>
 <context>
     <name>CLayoutPrefs2</name>
     <message>
         <source>Indent</source>
-        <translation type="unfinished"></translation>
+        <translation>Einrückung</translation>
     </message>
     <message>
         <source>Page
 Overlap</source>
-        <translation type="unfinished"></translation>
+        <translation>Seiten
+Überschneidung</translation>
     </message>
     <message>
         <source>Graphics
 Zoom</source>
-        <translation type="unfinished"></translation>
+        <translation>Grafik
+Zoom</translation>
     </message>
     <message>
         <source>Margin</source>
-        <translation type="unfinished"></translation>
+        <translation>Rand</translation>
     </message>
     <message>
         <source>Paragraph
 Leading</source>
-        <translation type="unfinished"></translation>
+        <translation>Absatz
+Abstand</translation>
     </message>
     <message>
         <source>Line
 Leading</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeilen-
+abstand</translation>
     </message>
     <message>
         <source>Markup</source>
-        <translation type="unfinished">Kodierung</translation>
+        <translation>Kodierung</translation>
     </message>
     <message>
         <source>Font</source>
@@ -348,7 +355,7 @@ Leading</source>
     </message>
     <message>
         <source>Mark Block</source>
-        <translation type="unfinished"></translation>
+        <translation>Block markieren</translation>
     </message>
     <message>
         <source>Copy Block</source>
@@ -359,19 +366,19 @@ Leading</source>
     <name>CMiscBarPrefs</name>
     <message>
         <source>Floating</source>
-        <translation type="unfinished"></translation>
+        <translation>Fließend</translation>
     </message>
     <message>
         <source>Single bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfache Leiste</translation>
     </message>
     <message>
         <source>Menu/tool bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Menü/Werzeugleiste</translation>
     </message>
     <message>
         <source>Multiple bars</source>
-        <translation type="unfinished"></translation>
+        <translation>Mehrere Leisten</translation>
     </message>
     <message>
         <source>Top</source>
@@ -414,11 +421,11 @@ Leading</source>
     </message>
     <message>
         <source>Depluck</source>
-        <translation type="unfinished"></translation>
+        <translation>Depluck</translation>
     </message>
     <message>
         <source>Dejpluck</source>
-        <translation type="unfinished"></translation>
+        <translation>Dejpluck</translation>
     </message>
     <message>
         <source>Continuous</source>
@@ -426,11 +433,11 @@ Leading</source>
     </message>
     <message>
         <source>Select Action</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktion auswählen</translation>
     </message>
     <message>
         <source>Plucker</source>
-        <translation type="unfinished"></translation>
+        <translation>Plucker</translation>
     </message>
 </context>
 <context>
@@ -484,19 +491,19 @@ Leading</source>
     </message>
     <message>
         <source>Layout</source>
-        <translation type="unfinished">Layout</translation>
+        <translation>Layout</translation>
     </message>
     <message>
         <source>Layout(2)</source>
-        <translation type="unfinished"></translation>
+        <translation>Layout(2)</translation>
     </message>
     <message>
         <source>Locale</source>
-        <translation type="unfinished"></translation>
+        <translation>Locale</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Gemischt</translation>
     </message>
     <message>
         <source>Buttons</source>
@@ -507,7 +514,7 @@ Leading</source>
     <name>CURLDialog</name>
     <message>
         <source>Save URL</source>
-        <translation type="unfinished"></translation>
+        <translation>URL speichern</translation>
     </message>
     <message>
         <source>Clipboard</source>
@@ -515,11 +522,11 @@ Leading</source>
     </message>
     <message>
         <source>Local file</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokale Datei</translation>
     </message>
     <message>
         <source>Global file</source>
-        <translation type="unfinished"></translation>
+        <translation>Globale Datei</translation>
     </message>
 </context>
 <context>
@@ -546,7 +553,7 @@ Leading</source>
     </message>
     <message>
         <source>Ideogram</source>
-        <translation type="unfinished"></translation>
+        <translation>Ideogramm</translation>
     </message>
 </context>
 <context>
@@ -585,7 +592,7 @@ Leading</source>
     </message>
     <message>
         <source>Two/One Touch</source>
-        <translation>Doppel/Singel Touch</translation>
+        <translation>Doppelt/Einfach tippen</translation>
     </message>
     <message>
         <source>Annotation</source>
@@ -701,7 +708,7 @@ Leading</source>
     </message>
     <message>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation>Werkzeugleiste</translation>
     </message>
     <message>
         <source>Run Script</source>
@@ -733,7 +740,7 @@ Leading</source>
     </message>
     <message>
         <source>Scrolling</source>
-        <translation type="unfinished"></translation>
+        <translation>Blättern</translation>
     </message>
     <message>
         <source>Set Target</source>
@@ -741,7 +748,7 @@ Leading</source>
     </message>
     <message>
         <source>Pause Paras</source>
-        <translation type="unfinished"></translation>
+        <translation>Pausiere Absatz</translation>
     </message>
     <message>
         <source>Set Encoding</source>
@@ -749,7 +756,7 @@ Leading</source>
     </message>
     <message>
         <source>Ideogram</source>
-        <translation type="unfinished"></translation>
+        <translation>Ideogramm</translation>
     </message>
     <message>
         <source>Bookmark</source>
@@ -757,7 +764,7 @@ Leading</source>
     </message>
     <message>
         <source>Reader</source>
-        <translation type="unfinished"></translation>
+        <translation>Reader</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/security.ts b/i18n/de/security.ts
index 6de956a..47318d6 100644
--- a/i18n/de/security.ts
+++ b/i18n/de/security.ts
@@ -107,15 +107,15 @@ Gerät erhalten.</translation>
     </message>
     <message>
         <source>Passcode</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort</translation>
     </message>
     <message>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisch einloggen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/sheetqt.ts b/i18n/de/sheetqt.ts
index 6a05307..f63d14e 100644
--- a/i18n/de/sheetqt.ts
+++ b/i18n/de/sheetqt.ts
@@ -1,643 +1,644 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CellFormat</name>
     <message>
         <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rahmen</translation>
     </message>
     <message>
         <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Hintergrund</translation>
     </message>
     <message>
         <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Schrift</translation>
     </message>
     <message>
         <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ausrichtung</translation>
     </message>
     <message>
         <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Breite:</translation>
     </message>
     <message>
         <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Farbe:</translation>
     </message>
     <message>
         <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard &amp;Rahmen</translation>
     </message>
     <message>
         <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Muster:</translation>
     </message>
     <message>
         <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard &amp;Hintergrund</translation>
     </message>
     <message>
         <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Schrift:</translation>
     </message>
     <message>
         <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Größe:</translation>
     </message>
     <message>
         <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
+        <translation>Fe&amp;tt</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kursiv</translation>
     </message>
     <message>
         <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Standar&amp;d Schrift</translation>
     </message>
     <message>
         <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vertikal:</translation>
     </message>
     <message>
         <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
+        <translation>H&amp;orizontal:</translation>
     </message>
     <message>
         <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zeilenumbruch</translation>
     </message>
     <message>
         <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
+        <translation>Standard &amp;Ausrichtung</translation>
     </message>
     <message>
         <source>Format Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Zellen formatieren</translation>
     </message>
     <message>
         <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Sheet</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Finden &amp;&amp; Ersetzen</translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Optionen</translation>
     </message>
     <message>
         <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Suche nach:</translation>
     </message>
     <message>
         <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ersetze &amp;mit:</translation>
     </message>
     <message>
         <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Typ</translation>
     </message>
     <message>
         <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Finde</translation>
     </message>
     <message>
         <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ersetze</translation>
     </message>
     <message>
         <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Alles ersetzen</translation>
     </message>
     <message>
         <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Grossschreibung</translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nur aktuelle Auswahl</translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vollständige Zelle</translation>
     </message>
     <message>
         <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Finden &amp; Ersetzen</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Sheet</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Inkonsistenz Fehler!</translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei kann nicht gespeichert werden!</translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei kann nicht geöffent werden!</translation>
     </message>
     <message>
         <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
+        <translation>Ungültiges Dateiformat!</translation>
     </message>
     <message>
         <source>Save File</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichere Datei</translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie die aktuelle Datei speichern?</translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dateiname:</translation>
     </message>
     <message>
         <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
+        <translation>UnbenannteDatei</translation>
     </message>
     <message>
         <source>New File</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei öffnen</translation>
     </message>
     <message>
         <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Öffnen</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>Save File As</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichere Datei als</translation>
     </message>
     <message>
         <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
+        <translation>Speichere &amp;als</translation>
     </message>
     <message>
         <source>Accept</source>
-        <translation type="unfinished"></translation>
+        <translation>Akzeptieren</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
+        <translation>A&amp;kzeptieren</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbruch</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbru&amp;ch</translation>
     </message>
     <message>
         <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
+        <translation>Zellen-Selektor</translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zellen-Selektor</translation>
     </message>
     <message>
         <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Zellen ausschneiden</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
+        <translation>Au&amp;sschneiden</translation>
     </message>
     <message>
         <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Zellen kopieren</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Zellen einfügen</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
+        <translation>Inhalt einfügen</translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Inhalt einfügen</translation>
     </message>
     <message>
         <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Zelleninhalt löschen</translation>
     </message>
     <message>
         <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Leeren</translation>
     </message>
     <message>
         <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Zellen einfügen</translation>
     </message>
     <message>
         <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
+        <translation>Zelle&amp;n</translation>
     </message>
     <message>
         <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeilen einfügen</translation>
     </message>
     <message>
         <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zeilen</translation>
     </message>
     <message>
         <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
+        <translation>Spalten einfügen</translation>
     </message>
     <message>
         <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
+        <translation>S&amp;palten</translation>
     </message>
     <message>
         <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
+        <translation>Blatt hinzufügen</translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Blätter</translation>
     </message>
     <message>
         <source>Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Zellen</translation>
     </message>
     <message>
         <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Zelle&amp;n</translation>
     </message>
     <message>
         <source>Row Height</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeilenhöhe</translation>
     </message>
     <message>
         <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Höhe</translation>
     </message>
     <message>
         <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeile anpassen</translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Anpassen</translation>
     </message>
     <message>
         <source>Show Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeile zeigen</translation>
     </message>
     <message>
         <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zeigen</translation>
     </message>
     <message>
         <source>Hide Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeile verstecken</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Verstecken</translation>
     </message>
     <message>
         <source>Column Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Spaltenbreite</translation>
     </message>
     <message>
         <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Breite</translation>
     </message>
     <message>
         <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Spalte anpassen</translation>
     </message>
     <message>
         <source>Show Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Spalte zeigen</translation>
     </message>
     <message>
         <source>Hide Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Spalte verstecken</translation>
     </message>
     <message>
         <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Blatt umbenennen</translation>
     </message>
     <message>
         <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Umbenennen</translation>
     </message>
     <message>
         <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Blatt löschen</translation>
     </message>
     <message>
         <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>Sort Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten sortieren</translation>
     </message>
     <message>
         <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sortieren</translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Finden &amp;&amp; Ersetzen</translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Finden &amp;&amp; Ersetzen</translation>
     </message>
     <message>
         <source>Equal To</source>
-        <translation type="unfinished"></translation>
+        <translation>Gleich mit</translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Gleich mit</translation>
     </message>
     <message>
         <source>Addition</source>
-        <translation type="unfinished"></translation>
+        <translation>Addition</translation>
     </message>
     <message>
         <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Addition</translation>
     </message>
     <message>
         <source>Subtraction</source>
-        <translation type="unfinished"></translation>
+        <translation>Subtraktion</translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Subtraktion</translation>
     </message>
     <message>
         <source>Multiplication</source>
-        <translation type="unfinished"></translation>
+        <translation>Multiplikation</translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Multiplikation</translation>
     </message>
     <message>
         <source>Division</source>
-        <translation type="unfinished"></translation>
+        <translation>Division</translation>
     </message>
     <message>
         <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Division</translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
+        <translation>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>Klammerung &amp;oeffnen</translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>Klammerung schließen</translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>Klammerung s&amp;chließen</translation>
     </message>
     <message>
         <source>Comma</source>
-        <translation type="unfinished"></translation>
+        <translation>Komma</translation>
     </message>
     <message>
         <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Komma</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
         <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Formatierung</translation>
     </message>
     <message>
         <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Daten</translation>
     </message>
     <message>
         <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zeile</translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Spalte</translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>B&amp;latt</translation>
     </message>
     <message>
         <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Funktion</translation>
     </message>
     <message>
         <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Standard</translation>
     </message>
     <message>
         <source>Summation</source>
-        <translation type="unfinished"></translation>
+        <translation>Summation</translation>
     </message>
     <message>
         <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Summation</translation>
     </message>
     <message>
         <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Absolut Wert</translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Absolut</translation>
     </message>
     <message>
         <source>Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sinus</translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
+        <translation>Si&amp;nus</translation>
     </message>
     <message>
         <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Sinus</translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>A&amp;rc Sinus</translation>
     </message>
     <message>
         <source>Cosine</source>
-        <translation type="unfinished"></translation>
+        <translation>Cosinus</translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cosinus</translation>
     </message>
     <message>
         <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
+        <translation>ArcCosinus</translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
+        <translation>ArcCos&amp;inus</translation>
     </message>
     <message>
         <source>Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>Tangens</translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tangens</translation>
     </message>
     <message>
         <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Tangens</translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Tan&amp;gens</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc Tangens der Koordinaten</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>K&amp;oord. Arc Tangens</translation>
     </message>
     <message>
         <source>Exponential</source>
-        <translation type="unfinished"></translation>
+        <translation>Exponential</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Exponential</translation>
     </message>
     <message>
         <source>Logarithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Logarithmus</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Logarithmus</translation>
     </message>
     <message>
         <source>Power</source>
-        <translation type="unfinished"></translation>
+        <translation>Potenz</translation>
     </message>
     <message>
         <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Potenz</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Mathematisch</translation>
     </message>
     <message>
         <source>Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Durchschnitt</translation>
     </message>
     <message>
         <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Durchschnitt</translation>
     </message>
     <message>
         <source>Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Maximum</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Ma&amp;ximum</translation>
     </message>
     <message>
         <source>Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimum</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Minimum</translation>
     </message>
     <message>
         <source>Count</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl</translation>
     </message>
     <message>
         <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
+        <translation>An&amp;zahl</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Statistisch</translation>
     </message>
     <message>
         <source>Functions</source>
-        <translation type="unfinished"></translation>
+        <translation>Funktionen</translation>
     </message>
     <message>
         <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Über Opie Sheet</translation>
     </message>
     <message>
         <source>Opie Sheet
@@ -651,137 +652,147 @@ Release Date: October 08, 2002
 This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
 
 http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Sheet
+Tabellenkalkulation für Opie
+QWDC Beta Winner (als Sheet/Qt)
+
+Entwickelt von: Serdar Ozler
+Release 1.0.2
+Release Datum: 8. Oktober 2002
+
+Dieses Produkt ist lizensiert unter GPL. Es darf frei verteilt werden. Wenn sie die neueste Version und auch den Quelltext haben möchten, besuchen Sie bitte folgende Website
+
+http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl der &amp;Zeilen:</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl der &amp;Spalten:</translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
+        <translation>Anzahl der &amp;Blätter:</translation>
     </message>
     <message>
         <source>Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Blatt</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Höhe jeder Zeile:</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
+        <translation>B&amp;reite jeder Spalte:</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Blattname:</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
+        <translation>Es gibt nur ein Blatt!</translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation>Sind Sie sicher?</translation>
     </message>
     <message>
         <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Typ</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
+        <translation>Zellen nach &amp;unten verschieben</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
+        <translation>Zellen nach &amp;rechts verschieben</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
+        <translation>Ganze &amp;Zeile</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
+        <translation>Ganze &amp;Spalte</translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Syntaktischer Fehler!</translation>
     </message>
     <message>
         <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>Suchschlüssel nicht gefunden!</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sortieren</translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Optionen</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sortieren nach</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dann nach</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
+        <translation>Dann &amp;nach </translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Großschreibung beachten</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Richtung</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
+        <translation>Von &amp;oben nach unten (Zeilen)</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
+        <translation>Von &amp;links nach rechts (Spalten)</translation>
     </message>
     <message>
         <source>Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>Sortieren</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Aufsteigend</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
+        <translation>A&amp;bsteigend</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
+        <translation>Eine einzelne Zelle kann nicht sortiert werden!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/showimg.ts b/i18n/de/showimg.ts
index f578d7f..ef81eb2 100644
--- a/i18n/de/showimg.ts
+++ b/i18n/de/showimg.ts
@@ -122,6 +122,56 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation>Dateiname</translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation>Dateigröße</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Größe</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation>Farben</translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation>Alpha</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Size</source>
+        <translation type="obsolete">Größe</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="obsolete">Farben</translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="obsolete">Alpha</translation>
+    </message>
+    <message>
+        <source>File Name</source>
+        <translation type="obsolete">Dateiname</translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="obsolete">Dateigröße</translation>
+    </message>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/de/stockticker.ts b/i18n/de/stockticker.ts
index 53c65ee..260d305 100644
--- a/i18n/de/stockticker.ts
+++ b/i18n/de/stockticker.ts
@@ -1,68 +1,69 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HelpWindow</name>
     <message>
         <source>&amp;Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei &amp;Oeffnen</translation>
     </message>
     <message>
         <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
+        <translation>S&amp;chließen</translation>
     </message>
     <message>
         <source>&amp;Backward</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rückwärts</translation>
     </message>
     <message>
         <source>&amp;Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Vorwärts</translation>
     </message>
     <message>
         <source>&amp;Home</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Home</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Lesezeichen hinzufügen</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;Go</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Gehe</translation>
     </message>
     <message>
         <source>History</source>
-        <translation type="unfinished"></translation>
+        <translation>Historie</translation>
     </message>
     <message>
         <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>Lesezeichen</translation>
     </message>
     <message>
         <source>Backward</source>
-        <translation type="unfinished"></translation>
+        <translation>Rückwärts</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorwärts</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished"></translation>
+        <translation>Home</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>Symbol Lookup</source>
-        <translation type="unfinished"></translation>
+        <translation>Symbol Suche</translation>
     </message>
     <message>
         <source>Enter something to lookup / search.</source>
-        <translation type="unfinished"></translation>
+        <translation>Geben Sie etwas zum nachschlagen / suchen ein.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/sysinfo.ts b/i18n/de/sysinfo.ts
index dc0f769..9bc29d6 100644
--- a/i18n/de/sysinfo.ts
+++ b/i18n/de/sysinfo.ts
@@ -1,4 +1,5 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>FileSysInfo</name>
     <message>
@@ -152,11 +153,11 @@ Click and hold on a module to see additional information about the module, or to
     </message>
     <message>
         <source>Used by</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzt von</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie wollen wirklich %1 für dieses Modul ausführen?</translation>
     </message>
 </context>
 <context>
@@ -223,7 +224,7 @@ Klicken Sie und halten Sie den Stylus um weitere Prozessinformationen angezeigt
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie wollen wirklich %1 an diesen Prozess schicken?</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/tableviewer.ts b/i18n/de/tableviewer.ts
index 7d41b6f..92f72a7 100644
--- a/i18n/de/tableviewer.ts
+++ b/i18n/de/tableviewer.ts
@@ -1,69 +1,70 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="unfinished"></translation>
+        <translation>KeyList::addKey() Kann keinen Standartwert für Typ %1 erstellen, Key nicht hinzugefügt.</translation>
     </message>
     <message>
         <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="unfinished"></translation>
+        <translation>DataElem::setField(%1, %2) Kein gültiger Typ gefunden</translation>
     </message>
 </context>
 <context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Zurücksetzen</translation>
     </message>
     <message>
         <source>key</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlüssel</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
     <message>
         <source>TableViewer - Edit Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>TableViewer - Schlüssel bearbeiten</translation>
     </message>
     <message>
         <source>Key Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlüssel Name</translation>
     </message>
     <message>
         <source>Key Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Schlüssel Typ</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <source>Clear All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alles leeren</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
-        <translation type="unfinished"></translation>
+        <translation>Listen Ansicht</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabellen Betrachter</translation>
     </message>
     <message>
         <source>could not load Document</source>
-        <translation type="unfinished"></translation>
+        <translation>konnte Dokument nicht laden</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/tabmanager.ts b/i18n/de/tabmanager.ts
index 494616b..68f4a9d 100644
--- a/i18n/de/tabmanager.ts
+++ b/i18n/de/tabmanager.ts
@@ -1,4 +1,5 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AppEdit</name>
     <message>
@@ -15,66 +16,67 @@
     </message>
     <message>
         <source>Exec:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausführen:</translation>
     </message>
     <message>
         <source>Comment:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kommentar:</translation>
     </message>
 </context>
 <context>
     <name>TabManager</name>
     <message>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Nachricht</translation>
     </message>
     <message>
         <source>Can&apos;t remove with applications
 still in the group.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann Anwendung nicht entfernen,
+wenn sie noch in der Gruppe ist.</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Are you sure you want to delete?</source>
-        <translation type="unfinished"></translation>
+        <translation>Sind Sie sicher, dass Sie löschen wollen?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Ja</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbruch</translation>
     </message>
     <message>
         <source>Can&apos;t remove.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kann nicht entfernen.</translation>
     </message>
     <message>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiter</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished"></translation>
+        <translation>Sammle Symbole...</translation>
     </message>
     <message>
         <source>Application</source>
-        <translation type="unfinished">Programm</translation>
+        <translation>Programm</translation>
     </message>
 </context>
 <context>
     <name>TabManagerBase</name>
     <message>
         <source>Tab Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiter Manager</translation>
     </message>
     <message>
         <source>Hierarchy</source>
-        <translation type="unfinished"></translation>
+        <translation>Hierarchie</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/textedit.ts b/i18n/de/textedit.ts
index 866d7a1..6df8394 100644
--- a/i18n/de/textedit.ts
+++ b/i18n/de/textedit.ts
@@ -1,4 +1,5 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>TextEdit</name>
     <message>
@@ -204,7 +205,9 @@ Speichern und weitermachen ?</translation>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Wirklich aktuelle Datei von&lt;BR&gt;
+Platte &lt;B&gt;löschen&lt;/B&gt;?&lt;BR&gt;
+Das ist &lt;B&gt;irreversibel!&lt;/B&gt;</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/todolist.ts b/i18n/de/todolist.ts
index f79e832..d54bdaf 100644
--- a/i18n/de/todolist.ts
+++ b/i18n/de/todolist.ts
@@ -34,7 +34,7 @@
     </message>
     <message>
         <source>Task Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Aufgaben Editor</translation>
     </message>
 </context>
 <context>
@@ -57,7 +57,7 @@
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Aufgaben</translation>
     </message>
 </context>
 <context>
@@ -84,7 +84,7 @@
     </message>
     <message>
         <source>View Task</source>
-        <translation>Aufgabe sehen</translation>
+        <translation>Aufgabe ansehen</translation>
     </message>
     <message>
         <source>Delete...</source>
@@ -333,11 +333,11 @@ Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann e
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten können nicht bearbeitet werden, es wird synchronisiert</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
-        <translation type="unfinished"></translation>
+        <translation>Daten können nicht bearbeitet werden, es wird synchronisiert</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/ubrowser.ts b/i18n/de/ubrowser.ts
index f3079ca..932c715 100644
--- a/i18n/de/ubrowser.ts
+++ b/i18n/de/ubrowser.ts
@@ -1,36 +1,37 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainView</name>
     <message>
         <source>uBrowser</source>
-        <translation type="unfinished"></translation>
+        <translation>uBrowser</translation>
     </message>
     <message>
         <source> - uBrowser</source>
-        <translation type="unfinished"></translation>
+        <translation>- uBrowser</translation>
     </message>
     <message>
         <source>%1 - uBrowser</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - uBrowser</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler!</translation>
     </message>
     <message>
         <source>IP-Address not found</source>
-        <translation type="unfinished"></translation>
+        <translation>IP-Adresse nicht gefunden</translation>
     </message>
     <message>
         <source>Error creating socket</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Erstellen des Sockets</translation>
     </message>
     <message>
         <source>Error connecting to socket</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Verbindungsaufbau zum Socket</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/wordgame.ts b/i18n/de/wordgame.ts
index ccb44d3..d33adc4 100644
--- a/i18n/de/wordgame.ts
+++ b/i18n/de/wordgame.ts
@@ -1,9 +1,10 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Board</name>
     <message>
         <source>Blanks: </source>
-        <translation type="unfinished"></translation>
+        <translation>Leerzeichen:</translation>
     </message>
     <message>
         <source>OK</source>
@@ -38,7 +39,7 @@
     </message>
     <message>
         <source>AI3: Smart AI player</source>
-        <translation type="unfinished"></translation>
+        <translation>KI3: Kluger KI Spieler</translation>
     </message>
     <message>
         <source>Rules</source>
@@ -99,27 +100,27 @@
     <name>WordGame</name>
     <message>
         <source>Word Game</source>
-        <translation type="unfinished"></translation>
+        <translation>Wort Spiel</translation>
     </message>
     <message>
         <source>Back</source>
-        <translation type="unfinished"></translation>
+        <translation>Zurück</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation type="unfinished"></translation>
+        <translation>Fertig</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Schliessen</translation>
     </message>
     <message>
         <source>End game</source>
-        <translation type="unfinished"></translation>
+        <translation>Spiel beenden</translation>
     </message>
     <message>
         <source>Do you want to end the game early?</source>
-        <translation type="unfinished"></translation>
+        <translation>Möchten Sie das Spiel früh aufhöhren?</translation>
     </message>
     <message>
         <source>Yes</source>
diff --git a/i18n/en/advancedfm.ts b/i18n/en/advancedfm.ts
index ed7af0f..8a9ac63 100644
--- a/i18n/en/advancedfm.ts
+++ b/i18n/en/advancedfm.ts
@@ -38,14 +38,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -255,6 +247,26 @@ and all it&apos;s contents ?</source>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -344,5 +356,9 @@ Finished
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/calculator.ts b/i18n/en/calculator.ts
index edd7e16..5d732d0 100644
--- a/i18n/en/calculator.ts
+++ b/i18n/en/calculator.ts
@@ -133,4 +133,203 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/datebook.ts b/i18n/en/datebook.ts
index 45d7547..a6ecc63 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -360,14 +360,6 @@ Quit anyway?</source>
     </message>
 </context>
 <context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
@@ -474,10 +466,6 @@ Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
@@ -521,6 +509,10 @@ Quit anyway?</source>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/en/libbatteryapplet.ts b/i18n/en/libbatteryapplet.ts
index 8ca62b8..5905f14 100644
--- a/i18n/en/libbatteryapplet.ts
+++ b/i18n/en/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/libqpe.ts b/i18n/en/libqpe.ts
index 9929ffe..49307d9 100644
--- a/i18n/en/libqpe.ts
+++ b/i18n/en/libqpe.ts
@@ -846,6 +846,22 @@ Free some memory and try again.</source>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/en/mailit.ts b/i18n/en/mailit.ts
index 3d729bc..fd9657c 100644
--- a/i18n/en/mailit.ts
+++ b/i18n/en/mailit.ts
@@ -200,6 +200,19 @@ Check user name and password&lt;/qt&gt;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/en/opieftp.ts b/i18n/en/opieftp.ts
index b837b35..86fd2ef 100644
--- a/i18n/en/opieftp.ts
+++ b/i18n/en/opieftp.ts
@@ -231,5 +231,9 @@ It must be empty</source>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/qpe.ts b/i18n/en/qpe.ts
index 10ba42e..dde7446 100644
--- a/i18n/en/qpe.ts
+++ b/i18n/en/qpe.ts
@@ -1,6 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppMonitor</name>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
@@ -13,61 +28,85 @@
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Calibrate</name>
     <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Welcome to Opie</source>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
     <message>
-        <source>Documents</source>
+        <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Icon View</source>
+        <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>List View</source>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DesktopApplication</name>
+    <name>DesktopPowerAlerter</name>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
+        <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery is running very low.</source>
+        <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>FirstUse</name>
     <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
+        <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>business card</source>
+        <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -78,6 +117,10 @@ Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
@@ -90,22 +133,33 @@ Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Finding documents</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching documents</source>
+        <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>LauncherView</name>
+    <name>LauncherTabWidget</name>
     <message>
-        <source>%1 files</source>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All types of file</source>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -114,70 +168,92 @@ Please charge the back-up battery.</source>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Medium inserted</source>
+        <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ServerApplication</name>
     <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Which media files</source>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Audio</source>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
+        <source>Battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Video</source>
+        <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link apps</source>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Limit search to dir: (not used yet)</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add</source>
+        <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Your decision will be stored on the medium.</source>
+        <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do not ask again for this medium</source>
+        <source>Memory Low
+Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Battery Status</source>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
+        <source>Shutdown...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -206,10 +282,6 @@ These termination options are provided primarily for use while developing and te
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
@@ -237,15 +309,11 @@ These termination options are provided primarily for use while developing and te
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
+        <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/en/showimg.ts b/i18n/en/showimg.ts
index 8f08d9e..daea628 100644
--- a/i18n/en/showimg.ts
+++ b/i18n/en/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index 3a70159..4e17ec5 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -39,11 +39,11 @@
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Pasar a local</translation>
+        <translation type="obsolete">Pasar a local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Pasar a remoto</translation>
+        <translation type="obsolete">Pasar a remoto</translation>
     </message>
     <message>
         <source>Size</source>
@@ -272,16 +272,28 @@ de %1?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
-        <translation type="obsolete">Gestor de Ficheros Avanzado :: </translation>
+        <translation type="unfinished">Gestor de Ficheros Avanzado :: </translation>
     </message>
     <message>
         <source> kB free</source>
-        <translation type="obsolete"> kB libres</translation>
+        <translation type="unfinished"> kB libres</translation>
     </message>
     <message>
         <source>Copy &apos;%1&apos; As</source>
         <translation type="obsolete">Copiar &quot;%1&quot; como</translation>
     </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -374,5 +386,9 @@ Finalizado
         <source>Error setting mode</source>
         <translation>Error fijando modo</translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/calculator.ts b/i18n/es/calculator.ts
index e74cf5b..2067367 100644
--- a/i18n/es/calculator.ts
+++ b/i18n/es/calculator.ts
@@ -133,4 +133,203 @@
         <translation>Estándar</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished">Estándar</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 0dad7a2..8e09036 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -368,7 +368,7 @@ Libere espacio y vuelva a intentarlo.
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation>LMXJVSDL</translation>
+        <translation type="obsolete">LMXJVSDL</translation>
     </message>
 </context>
 <context>
@@ -514,7 +514,7 @@ Libere espacio y vuelva a intentarlo.
     </message>
     <message>
         <source>Start time</source>
-        <translation>Hora inicio</translation>
+        <translation type="obsolete">Hora inicio</translation>
     </message>
     <message>
         <source>All day</source>
@@ -560,6 +560,10 @@ Libere espacio y vuelva a intentarlo.
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">Hora inicio</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/es/libbatteryapplet.ts b/i18n/es/libbatteryapplet.ts
index 21b1f0b..834fa62 100644
--- a/i18n/es/libbatteryapplet.ts
+++ b/i18n/es/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation>Sin chaqueta con batería insertada</translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index a90b130..69ae925 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -862,6 +862,22 @@ Libere memoria e intételo de nuevo.</translation>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Error</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/es/mailit.ts b/i18n/es/mailit.ts
index f794c01..3fcf2c3 100644
--- a/i18n/es/mailit.ts
+++ b/i18n/es/mailit.ts
@@ -205,6 +205,19 @@ Verifique nombre de usuario y contraseña&lt;/qt&gt;</translation>
         <translation>Ok
 </translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/es/opieftp.ts b/i18n/es/opieftp.ts
index 196f943..d998820 100644
--- a/i18n/es/opieftp.ts
+++ b/i18n/es/opieftp.ts
@@ -243,5 +243,9 @@ Debaría estar vacío</translation>
         <source>Sorry name already taken</source>
         <translation>Lo siento, nombre ya usado</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index 2529f03..c2663ef 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -1,17 +1,79 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished">Problema en la aplicación</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>Problema en la aplicación</translation>
+        <translation type="obsolete">Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -19,239 +81,410 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>Pulse las crucecitas firmemente y con
+        <translation type="obsolete">Pulse las crucecitas firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Bienvenido a Opie</translation>
+        <translation type="obsolete">Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>Documentos</translation>
+        <translation type="obsolete">Documentos</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>Ver como iconos</translation>
+        <translation type="obsolete">Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>Ver como lista</translation>
+        <translation type="obsolete">Ver como lista</translation>
     </message>
 </context>
 <context>
     <name>DesktopApplication</name>
     <message>
         <source>Battery is running very low.</source>
-        <translation>La batería está muy baja.</translation>
+        <translation type="obsolete">La batería está muy baja.</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>¡El nivel de la batería es crítico!
+        <translation type="obsolete">¡El nivel de la batería es crítico!
 ¡Apágueme o enchúfeme!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>La batería de respaldo está muy baja.
+        <translation type="obsolete">La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>tarjeta de visita</translation>
+        <translation type="obsolete">tarjeta de visita</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>Información</translation>
+        <translation type="obsolete">Información</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;La fecha del sistema parece no ser válida.
+        <translation type="obsolete">&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">Estado de la Batería</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation>Lanzador</translation>
+        <translation type="unfinished">Lanzador</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation> - Lanzador</translation>
+        <translation type="unfinished"> - Lanzador</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation>Sin aplicación</translation>
+        <translation type="unfinished">Sin aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
+        <translation type="unfinished">&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation>Buscando documentos</translation>
+        <translation type="obsolete">Buscando documentos</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation>Buscando documentos</translation>
+        <translation type="obsolete">Buscando documentos</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">Documentos</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished">Ver como iconos</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished">Ver como lista</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>%1 ficheros</translation>
+        <translation type="obsolete">%1 ficheros</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>Todos los tipos de ficheros</translation>
+        <translation type="obsolete">Todos los tipos de ficheros</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation>Ver como documentos</translation>
+        <translation type="unfinished">Ver como documentos</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>Medio insertado</translation>
+        <translation type="obsolete">Medio insertado</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Qué ficheros</translation>
+        <translation type="obsolete">Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Audio</translation>
+        <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Imagen</translation>
+        <translation type="obsolete">Imagen</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Texto</translation>
+        <translation type="obsolete">Texto</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Vídeo</translation>
+        <translation type="obsolete">Vídeo</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Todos</translation>
+        <translation type="obsolete">Todos</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>Enlace a aplicaciones</translation>
+        <translation type="obsolete">Enlace a aplicaciones</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>Limitar búsqueda al directorio: (no se usa aún)</translation>
+        <translation type="obsolete">Limitar búsqueda al directorio: (no se usa aún)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>Añadir</translation>
+        <translation type="obsolete">Añadir</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>Su decisión será guardada en el medio.</translation>
+        <translation type="obsolete">Su decisión será guardada en el medio.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>No preguntar otra vez por este medio</translation>
+        <translation type="obsolete">No preguntar otra vez por este medio</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
+        <translation type="obsolete">Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation>Estado de la Batería</translation>
+        <translation type="obsolete">Estado de la Batería</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Información</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;La fecha del sistema parece no ser válida.
+(%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">¡El nivel de la batería es crítico!
+¡Apágueme o enchúfeme!</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">La batería de respaldo está muy baja.
+Por favor cárguela.</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished">tarjeta de visita</translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
-        <translation>Terminar</translation>
+        <translation type="unfinished">Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>Terminar Opie</translation>
+        <translation type="unfinished">Terminar Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation>Reiniciar</translation>
+        <translation type="unfinished">Reiniciar</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>Reiniciar Opie</translation>
+        <translation type="unfinished">Reiniciar Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation>Apagar</translation>
+        <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancelar</translation>
+        <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation>&lt;p&gt;
+        <translation type="unfinished">&lt;p&gt;
 Estas opciones de terminación se usan principalmente en las pruebas y desarrollo del sistema Opie. En un entorno normal, estos conceptos son innecesarios.</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation>Apagar...</translation>
+        <translation type="unfinished">Apagar...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>Conexión de sincronización</translation>
+        <translation type="unfinished">Conexión de sincronización</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>Denegar</translation>
+        <translation type="unfinished">Denegar</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation>Permitir</translation>
+        <translation type="unfinished">Permitir</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
+        <translation type="unfinished">&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation>&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
+        <translation type="unfinished">&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>Sincronizando</translation>
+        <translation type="obsolete">Sincronizando</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Contactos&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
+        <translation type="obsolete">&amp;Cancelar</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/showimg.ts b/i18n/es/showimg.ts
index 2f558d6..dea5560 100644
--- a/i18n/es/showimg.ts
+++ b/i18n/es/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index e5c2580..8512994 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -39,7 +39,7 @@
     </message>
     <message>
         <source>Find</source>
-        <translation>Chercher</translation>
+        <translation>Rechercher</translation>
     </message>
     <message>
         <source>Write Mail To</source>
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>My Personal Details</source>
-        <translation>Mes Informations Personnelles</translation>
+        <translation>Informations Personnelles</translation>
     </message>
     <message>
         <source>View</source>
@@ -59,19 +59,20 @@
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
-        <translation>Edition non autorisée, synchronisation en cours</translation>
+        <translation>Edition non autorisée,&lt;br&gt;
+synchronisation en cours</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
-        <translation>Editer Mes Informations Personnelles</translation>
+        <translation>Editer Informations Personnelles</translation>
     </message>
     <message>
         <source>Edit Address</source>
-        <translation>Editer Adresse</translation>
+        <translation>Editer Contact</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
-        <translation>Contacts - Mes Informations Personnelles</translation>
+        <translation>Contacts - Informations Personnelles</translation>
     </message>
     <message>
         <source>Out of space</source>
@@ -83,19 +84,19 @@ Free up some space
 and try again.
 
 Quit anyway?</source>
-        <translation>Impossible de sauvegarder
-Libérez de la mémoire
-et réessayez
-
+        <translation>Impossible de sauvegarder&lt;br&gt;
+Libérez de la mémoire&lt;br&gt;
+et réessayez&lt;br&gt;
+&lt;br&gt;
 Quitter ?</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Tout</translation>
+        <translation>Toutes</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Non Classé</translation>
+        <translation>Non classée</translation>
     </message>
     <message>
         <source>Import vCard</source>
@@ -111,7 +112,7 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation>Config</translation>
+        <translation>Préférences</translation>
     </message>
     <message>
         <source>Not Found</source>
@@ -135,7 +136,7 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Right file type ?</source>
-        <translation>Type Fichier Valide ?</translation>
+        <translation>Type fichier valide ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
@@ -155,8 +156,8 @@ Quitter ?</translation>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
-        <translation>Le fichier selectionné
-ne se termine pas par &quot;.vcf&quot;.
+        <translation>Le fichier selectionné&lt;br&gt;
+ne se termine pas par &quot;.vcf&quot;.&lt;br&gt;
 Voulez-vous vraiment l&apos;ouvrir ?</translation>
     </message>
     <message>
@@ -166,7 +167,8 @@ Voulez-vous vraiment l&apos;ouvrir ?</translation>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
-        <translation>Voulez-vous vraimment ajouter un contact pour
+        <translation>Voulez-vous vraimment&lt;br&gt;
+ajouter un contact pour&lt;br&gt;
 %1 ?</translation>
     </message>
     <message>
@@ -179,26 +181,28 @@ Voulez-vous vraiment l&apos;ouvrir ?</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
-        <translation>Vous devez sélectionner un contact !</translation>
+        <translation>Vous devez sélectionner&lt;br&gt;
+un contact !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
-        <translation>Vous devez rentrer un nom de fichier !</translation>
+        <translation>Vous devez entrer&lt;br&gt;
+un nom de fichier !</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
-        <translation>Aucun contact trouvé correspondant au motif de recherche !</translation>
+        <translation>Aucun contact trouvé !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
-        <translation>Style de Requête</translation>
+        <translation>Type de Requête</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
-        <translation>Utiliser des Expressions Régulières</translation>
+        <translation>Utiliser les Expressions Régulières</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
@@ -225,10 +229,9 @@ Voulez-vous vraiment l&apos;ouvrir ?</translation>
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
-        <translation>Note : QT-Mail est fourni
-dans la ROM par défaut de
-SHARP. Opie-Mail est founi
-gratuitement !</translation>
+        <translation>Note : QT-Mail est fourni dans la ROM
+par défaut de SHARP. Opie-Mail est
+founi gratuitement !</translation>
     </message>
     <message>
         <source>Misc</source>
@@ -236,7 +239,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Search Settings</source>
-        <translation>Config. Recherche</translation>
+        <translation>Préférences Recherche</translation>
     </message>
     <message>
         <source>Font</source>
@@ -260,7 +263,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
-        <translation>Ordre des Contacts :</translation>
+        <translation>Ordre de recherche de contact : </translation>
     </message>
     <message>
         <source>Up</source>
@@ -276,7 +279,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Supprimer</translation>
+        <translation>Effacer</translation>
     </message>
     <message>
         <source>Configuration</source>
@@ -288,7 +291,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
-        <translation>Paramètres du type de Recherche</translation>
+        <translation>Paramètres du type de recherche</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
@@ -340,11 +343,11 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
-        <translation>L&apos;ordre (haut -&gt; bas) définit le premier contact affiché dans la deuxième colonne en mode liste</translation>
+        <translation>L&apos;ordre (haut -&gt; bas) définit le premier élément affiché dans la deuxième colonne en mode liste</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
-        <translation>Outils/-Barre de Menus</translation>
+        <translation>Outils-/Barre de Menus</translation>
     </message>
     <message>
         <source>Fixed</source>
@@ -352,7 +355,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
-        <translation>Utiliser un menu/-barre d&apos;outils fixe après redémarrage de l&apos;application !</translation>
+        <translation>Utiliser un menu-/barre d&apos;outils fixe après redémarrage de l&apos;application !</translation>
     </message>
     <message>
         <source>Moveable</source>
@@ -371,7 +374,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Second Prénom</translation>
+        <translation>2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
@@ -383,15 +386,15 @@ gratuitement !</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Fichier Sous</translation>
+        <translation>Classer sous</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Genre</translation>
+        <translation>Type</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Fonction</translation>
+        <translation>Titre</translation>
     </message>
     <message>
         <source>City</source>
@@ -411,7 +414,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Organization</source>
-        <translation>Organisation</translation>
+        <translation>Société</translation>
     </message>
     <message>
         <source>Category</source>
@@ -419,7 +422,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Notes...</source>
-        <translation>Notes...</translation>
+        <translation>Note...</translation>
     </message>
     <message>
         <source>General</source>
@@ -431,7 +434,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation>Maison</translation>
+        <translation>Domicile</translation>
     </message>
     <message>
         <source>Address</source>
@@ -439,7 +442,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Zip Code</source>
-        <translation>Code postal</translation>
+        <translation>Code Postal</translation>
     </message>
     <message>
         <source>United States</source>
@@ -483,7 +486,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Enter Note</source>
-        <translation>Entrer Note</translation>
+        <translation>Note</translation>
     </message>
     <message>
         <source>Edit Name</source>
@@ -1247,7 +1250,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Date de naissance</translation>
+        <translation>Date de Naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
@@ -1339,7 +1342,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
-        <translation>La société ou organisation d&apos;appartenance</translation>
+        <translation>Le lieu de travail du contact</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
@@ -1354,15 +1357,15 @@ gratuitement !</translation>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Téléphone (Bureau)</translation>
+        <translation>Tél (Bur.)</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax (Bureau)</translation>
+        <translation>Fax (Bur.)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Portable (Bureau)</translation>
+        <translation>Mobile (Bur.)</translation>
     </message>
     <message>
         <source>Default Email</source>
@@ -1374,19 +1377,19 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Téléphone (Domicile)</translation>
+        <translation>Tél (Dom.)</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax (Domicile)</translation>
+        <translation>Fax (Dom.)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Portable (Domicile)</translation>
+        <translation>Mobile (Perso.)</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Bureau</translation>
+        <translation>Service</translation>
     </message>
     <message>
         <source>Profession</source>
@@ -1402,11 +1405,11 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Epouse</translation>
+        <translation>Epou(x|se)</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Genre</translation>
+        <translation>Type</translation>
     </message>
     <message>
         <source>Birthday</source>
@@ -1434,7 +1437,7 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Second Prénom</translation>
+        <translation>2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
@@ -1462,59 +1465,59 @@ gratuitement !</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Rue (Bureau)</translation>
+        <translation>Rue (Bur.)</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Ville (Bureau)</translation>
+        <translation>Ville (Bur.)</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Département (Bureau)</translation>
+        <translation>Département (Bur.)</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Code postal (Bureau)</translation>
+        <translation>Code Postal (Bur.)</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Pays (Bureau)</translation>
+        <translation>Pays (Bur.)</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Alphapage (Bureau)</translation>
+        <translation>Alphapage (Bur.)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Page web (Bureau)</translation>
+        <translation>Page Web (Bur.)</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Rue (Domicile)</translation>
+        <translation>Rue (Dom.)</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Ville (Domicile)</translation>
+        <translation>Ville (Dom.)</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Département (Domicile)</translation>
+        <translation>Département (Dom.)</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Code postal (Domicile)</translation>
+        <translation>Code Postal (Dom.)</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Pays (Domicile)</translation>
+        <translation>Pays (Dom.)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Page Web (Domicile)</translation>
+        <translation>Page Web (Perso.)</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notes</translation>
+        <translation>Note</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index ffa5d68..69f13a3 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -4,7 +4,7 @@
     <name>AdvancedFm</name>
     <message>
         <source>AdvancedFm</source>
-        <translation>AdvancedFm</translation>
+        <translation>Explorateur</translation>
     </message>
     <message>
         <source>File</source>
@@ -12,11 +12,11 @@
     </message>
     <message>
         <source>View</source>
-        <translation>Affichage</translation>
+        <translation>Vue</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
-        <translation>Montrer Fichiers Cachés</translation>
+        <translation>Afficher Fichiers Cachés</translation>
     </message>
     <message>
         <source>Make Directory</source>
@@ -40,11 +40,11 @@
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Basculer sur &quot;Local&quot;</translation>
+        <translation type="obsolete">Basculer sur &quot;Local&quot;</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Basculer sur &quot;Distant&quot;</translation>
+        <translation type="obsolete">Basculer sur &quot;Distant&quot;</translation>
     </message>
     <message>
         <source>Size</source>
@@ -88,11 +88,11 @@
     </message>
     <message>
         <source>AdvancedFm Output</source>
-        <translation>Sortie d&apos;AdvancedFm</translation>
+        <translation>Sortie Explorateur</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
-        <translation>Envoie AvancedFM</translation>
+        <translation>Emission Explorateur</translation>
     </message>
     <message>
         <source>Ir sent.</source>
@@ -128,11 +128,11 @@
     </message>
     <message>
         <source>File Info</source>
-        <translation>Propriétés Fichier</translation>
+        <translation>Info Fichier</translation>
     </message>
     <message>
         <source>Set Permissions</source>
-        <translation>Définir les Droits</translation>
+        <translation>Définir Permissions</translation>
     </message>
     <message>
         <source>Properties</source>
@@ -140,7 +140,7 @@
     </message>
     <message>
         <source>Beam File</source>
-        <translation>Envoyer fichier</translation>
+        <translation>Emission Fichier</translation>
     </message>
     <message>
         <source>Copy </source>
@@ -152,7 +152,7 @@
     </message>
     <message>
         <source>Copy Same Dir</source>
-        <translation>Copier le même Répertoire</translation>
+        <translation>Copier dans ce même répertoire</translation>
     </message>
     <message>
         <source>Could not copy
@@ -222,20 +222,22 @@ Voulez-vous vraiment l&apos;effacer?</translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
-        <translation>%1 existe déjà. Confirmer son écrasement ?</translation>
+        <translation>%1 existe déjà.
+Confirmer son écrasement ?</translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
-        <translation>Impossible de copier %1 vers %2</translation>
+        <translation>Impossible de copier
+%1 vers %2</translation>
     </message>
     <message>
         <source>Advanced FileManager
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-        <translation>Advanced FileManager(new line)
-Copyright 2002-2003 de(new line)
-L.J.Potter&lt;llornkcor@handhelds.org&gt;(new line)
+        <translation>Gestionnaire de fichier Explorateur
+Copyright 2002-2003
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
 Sous licence GPL</translation>
     </message>
     <message>
@@ -262,31 +264,53 @@ Ce n&apos;en est pas un!!</translation>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
-        <translation>Impossible d&apos;effacer le répertoire courant
-des favoris.
+        <translation>Impossible d&apos;effacer le répertoire
+courant des favoris.
 Ce n&apos;est pas un favoris !</translation>
     </message>
     <message>
         <source>File Search</source>
-        <translation>Rechercher Fichier</translation>
+        <translation>Recherche Fichier</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
-        <translation>Voulez-vous réellement supprimer %1
+        <translation>Voulez-vous réellement
+supprimer %1
 et tout son contenu ?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
-        <translation>Confirmer l&apos;effacement de %1 ?</translation>
+        <translation>Confirmer suppression de
+%1 ?</translation>
+    </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation>Explorateur :: </translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation>Ko libre</translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation>Ouvrir Liste 1</translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation>Ouvrir Liste 2</translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation>Pas Encore Implémenté</translation>
     </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
-        <translation>Sauvegarder la sortie dans un fichier</translation>
+        <translation>Enregistrer la sortie dans un fichier</translation>
     </message>
     <message>
         <source>Output</source>
@@ -315,11 +339,11 @@ Terminé
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
-        <translation>Définir les Droits</translation>
+        <translation>Définir Permissions</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
-        <translation>Définir les droits pour :</translation>
+        <translation>Définir permissions de : </translation>
     </message>
     <message>
         <source>owner</source>
@@ -373,5 +397,9 @@ Terminé
         <source>Error setting mode</source>
         <translation>Erreur lors du changement de mode</translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation>Permissions Fichier</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index ea1d4ff..e089c8b 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -24,27 +24,28 @@
     </message>
     <message>
         <source>Force styling for all applications.</source>
-        <translation>Forcer le style pour toutes les appilcations.</translation>
+        <translation>Forcer style pour toutes les applications.</translation>
     </message>
     <message>
         <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation>Désactiver le style pour ces applications (&lt;b&gt;*&lt;/b&gt; peut être utilisé comme joker):</translation>
+        <translation>Désactiver style pour les applications :
+(&lt;b&gt;*&lt;/b&gt; peut être utilisé comme joker):</translation>
     </message>
     <message>
         <source>Binary file(s)</source>
-        <translation>Fichier(s) binaire</translation>
+        <translation>Applications</translation>
     </message>
     <message>
         <source>Tab style:</source>
-        <translation>Style des onglets:</translation>
+        <translation>Type Onglets : </translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation>Onglets</translation>
+        <translation>Onglets simple</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
-        <translation>Onglets avec icônes</translation>
+        <translation>Onglets + icônes</translation>
     </message>
     <message>
         <source>Drop down list</source>
@@ -52,7 +53,7 @@
     </message>
     <message>
         <source>Drop down list w/icons</source>
-        <translation>Liste déroulante avec icônes</translation>
+        <translation>Liste déroulante + icônes</translation>
     </message>
     <message>
         <source>Top</source>
@@ -76,7 +77,7 @@
     </message>
     <message>
         <source>Windows</source>
-        <translation>Fenêtres</translation>
+        <translation>Fenêtre</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -226,11 +227,11 @@ Cette partie vous permet de sélectionner une application et de lui attribuer de
     </message>
     <message>
         <source>Appearance Settings</source>
-        <translation>Préferences d&apos;Apparence</translation>
+        <translation>Préférences d&apos;Apparence</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
-        <translation>Sens de rotation:</translation>
+        <translation>Rotation : </translation>
     </message>
 </context>
 <context>
@@ -241,7 +242,7 @@ Cette partie vous permet de sélectionner une application et de lui attribuer de
     </message>
     <message>
         <source>Click here to select a color for: </source>
-        <translation>Cliquez ici pour sélectionner un couleur pour :</translation>
+        <translation>Cliquez ici pour sélectionner un couleur pour : </translation>
     </message>
 </context>
 <context>
diff --git a/i18n/fr/aqpkg.ts b/i18n/fr/aqpkg.ts
index 6adb193..2ab43db 100644
--- a/i18n/fr/aqpkg.ts
+++ b/i18n/fr/aqpkg.ts
@@ -94,7 +94,8 @@
     <message>
         <source>Upgrade
 </source>
-        <translation>Mise-à-jour</translation>
+        <translation>Mise à jour
+</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
@@ -102,7 +103,7 @@
     </message>
     <message>
         <source>(Upgrade)</source>
-        <translation>(Mise-à-jour)</translation>
+        <translation>(Mise à jour)</translation>
     </message>
     <message>
         <source>Destination</source>
@@ -222,7 +223,7 @@
     </message>
     <message>
         <source>Normal messages</source>
-        <translation>Messages Normaux</translation>
+        <translation>Messages normaux</translation>
     </message>
     <message>
         <source>Informative messages</source>
@@ -230,7 +231,7 @@
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation>Sortie des erreurs</translation>
+        <translation>Problème rencontré</translation>
     </message>
 </context>
 <context>
@@ -283,7 +284,7 @@
     </message>
     <message>
         <source>Could not open :</source>
-        <translation>Ouverture impossible de :</translation>
+        <translation>Ouverture impossible de : </translation>
     </message>
     <message>
         <source>Creating directory </source>
@@ -330,15 +331,15 @@
     </message>
     <message>
         <source>Update lists</source>
-        <translation>Mettre à jour les listes</translation>
+        <translation>Mise à jour les listes</translation>
     </message>
     <message>
         <source>Click here to update package lists from servers.</source>
-        <translation>Cliquez ici pour mettre les listes de paquets à jour depuis les serveurs.</translation>
+        <translation>Cliquez ici pour mettre les listes de paquets des serveurs à jour.</translation>
     </message>
     <message>
         <source>Upgrade</source>
-        <translation>Mettre à jour</translation>
+        <translation>Mise à jour</translation>
     </message>
     <message>
         <source>Click here to upgrade all installed packages if a newer version is available.</source>
@@ -366,7 +367,7 @@
     </message>
     <message>
         <source>Show packages not installed</source>
-        <translation>Montrer les paquets non installés</translation>
+        <translation>Afficher les paquets non installés</translation>
     </message>
     <message>
         <source>Click here to show packages available which have not been installed.</source>
@@ -422,7 +423,7 @@
     </message>
     <message>
         <source>Quick Jump keypad</source>
-        <translation>Clavier d&apos;Accès Rapide</translation>
+        <translation>Clavier Accès Rapide</translation>
     </message>
     <message>
         <source>Click here to display/hide keypad to allow quick movement through the package list.</source>
@@ -466,15 +467,15 @@
     </message>
     <message>
         <source>Servers:</source>
-        <translation>Serveurs :</translation>
+        <translation>Serveurs : </translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
-        <translation>Cliquez ici pour sélectionner un serveur de packages.</translation>
+        <translation>Cliquez ici pour sélectionner un serveur de paquets.</translation>
     </message>
     <message>
         <source>Packages</source>
-        <translation>Packages</translation>
+        <translation>Paquets</translation>
     </message>
     <message>
         <source>This is a listing of all packages for the server feed selected above.
@@ -484,13 +485,13 @@ A blue dot next to the package name indicates that the package is currently inst
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
-        <translation>Voici la liste de tous les packages disponibles sur le serveur sélectionné.
+        <translation>Voici la liste de tous les paquets disponibles sur le serveur sélectionné.
 
-Un point bleu signifie que le package est déjà installé sur cet appareil.
+Un point bleu signifie que le paquet est déjà installé sur cet appareil.
 
-Un point bleu avec une étoile signifie que le package est déjà installé, mais que la version du serveur est plus récente.
+Un point bleu avec une étoile signifie que le paquet est déjà installé, mais que la version du serveur est plus récente.
 
-Cochez la case en début de ligne pour sélectionner un package.</translation>
+Cochez la case en début de ligne pour sélectionner un paquet.</translation>
     </message>
     <message>
         <source>About AQPkg</source>
@@ -547,7 +548,7 @@ Cochez la case en début de ligne pour sélectionner un package.</translation>
     </message>
     <message>
         <source>Refreshing server package lists</source>
-        <translation>Rafraîchit la liste de paquets des serveurs</translation>
+        <translation>Rafraîchit la liste des paquets des serveurs</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
@@ -568,7 +569,7 @@ Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>Upgrading installed packages</source>
-        <translation>Met à jour les paquets installés</translation>
+        <translation>Mise à jour des paquets installés</translation>
     </message>
     <message>
         <source>Are you sure you wish to delete
@@ -650,7 +651,7 @@ Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
-        <translation>Mise-à-jour du Bureau...</translation>
+        <translation>Mise à jour du Bureau...</translation>
     </message>
 </context>
 <context>
@@ -758,11 +759,11 @@ Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="obsolete">Nom :</translation>
+        <translation type="obsolete">Nom : </translation>
     </message>
     <message>
         <source>URL:</source>
-        <translation type="obsolete">URL :</translation>
+        <translation type="obsolete">URL : </translation>
     </message>
     <message>
         <source>Change</source>
@@ -857,11 +858,11 @@ Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation>Nom : </translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation>Addresse :</translation>
+        <translation>Addresse : </translation>
     </message>
     <message>
         <source>Active Server</source>
@@ -869,7 +870,7 @@ Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation>Mise-à-jour</translation>
+        <translation>Ajouter - Mettre à jour</translation>
     </message>
     <message>
         <source>Destination</source>
@@ -877,7 +878,7 @@ Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation>Emplacement :</translation>
+        <translation>Emplacement : </translation>
     </message>
     <message>
         <source>Link to root</source>
@@ -897,11 +898,11 @@ Etes-vous sûr ?</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation>Nom Utilisateur :</translation>
+        <translation>Nom Utilisateur : </translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Mot de passe :</translation>
+        <translation>Mot de passe : </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/backgammon.ts b/i18n/fr/backgammon.ts
index 6c5ec70..c054838 100644
--- a/i18n/fr/backgammon.ts
+++ b/i18n/fr/backgammon.ts
@@ -52,8 +52,9 @@
     <message>
         <source>Expose you own pieces.
 After such a move only one piece will remain in the slot</source>
-        <translation>Expose vos propres pièces.
-Après un tel choix seul une pièce restera dans la case</translation>
+        <translation>Exposer vos propres pièces.
+Après un tel choix seul une pièce
+restera dans la case</translation>
     </message>
     <message>
         <source>Protect a single piece by
@@ -98,7 +99,7 @@ next to a field for help</source>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Supprimer</translation>
+        <translation>Quitter</translation>
     </message>
     <message>
         <source>Game</source>
@@ -118,7 +119,7 @@ next to a field for help</source>
     </message>
     <message>
         <source>AI</source>
-        <translation>AI</translation>
+        <translation>I.A</translation>
     </message>
     <message>
         <source>Rules</source>
diff --git a/i18n/fr/backup.ts b/i18n/fr/backup.ts
index 177dd8a..8a7c736 100644
--- a/i18n/fr/backup.ts
+++ b/i18n/fr/backup.ts
@@ -4,11 +4,11 @@
     <name>BackupAndRestore</name>
     <message>
         <source>Backup and Restore... working...</source>
-        <translation>Sauvegarde et restauration... travail en cours...</translation>
+        <translation>Sauvegarde Restauration... en cours...</translation>
     </message>
     <message>
         <source>Backup and Restore</source>
-        <translation>Sauvegarde et Restauration</translation>
+        <translation>Sauvegarde Restauration</translation>
     </message>
     <message>
         <source>Error from System:
@@ -34,7 +34,7 @@
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
-        <translation>Sauvegarde et Restauration.. Echec !!</translation>
+        <translation>Sauvegarde Restauration.. Echec !!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
@@ -42,7 +42,8 @@
     </message>
     <message>
         <source>Please select something to restore.</source>
-        <translation>Veuillez sélectionner un élément à restaurer.</translation>
+        <translation>Veuillez sélectionner un élément
+à restaurer.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
@@ -50,18 +51,19 @@
     </message>
     <message>
         <source>Unable to open File: %1</source>
-        <translation>Impossible d&apos;ouvrir fichier : %1</translation>
+        <translation>Impossible d&apos;ouvrir fichier :
+%1</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
-        <translation>Restauration Effectuée.</translation>
+        <translation>Restauration effectuée.</translation>
     </message>
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
-        <translation>Sauvegarde et Restauration</translation>
+        <translation>Sauvegarde Restauration</translation>
     </message>
     <message>
         <source>Backup</source>
@@ -97,7 +99,7 @@
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation>Mise-à-jour Liste des Fichiers</translation>
+        <translation>Rafraichir la liste des fichiers</translation>
     </message>
 </context>
 <context>
@@ -108,7 +110,7 @@
     </message>
     <message>
         <source>Error Message:</source>
-        <translation>Message d&apos;Erreur :</translation>
+        <translation>Message d&apos;Erreur : </translation>
     </message>
     <message>
         <source>&amp;OK</source>
diff --git a/i18n/fr/bounce.ts b/i18n/fr/bounce.ts
index e91fa24..94f36af 100644
--- a/i18n/fr/bounce.ts
+++ b/i18n/fr/bounce.ts
@@ -20,7 +20,7 @@
     </message>
     <message>
         <source>&amp;Game</source>
-        <translation>Par&amp;tie</translation>
+        <translation>&amp;Jeu</translation>
     </message>
     <message>
         <source>Score: 00</source>
@@ -49,8 +49,9 @@
     <message>
         <source>Game paused.
 Press P to continue!</source>
-        <translation>Jeu en Pause.
-Pressez P pour continuer !</translation>
+        <translation>Jeu en Pause...
+Pressez P pour continuer ou
+sélectionner l&apos;option du menu !</translation>
     </message>
     <message>
         <source>Game Over!
@@ -77,13 +78,15 @@ Score : %1</translation>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
-        <translation>Vous avez réussi à nettoyer plus de 75%.
+        <translation>Vous avez réussi à protéger
+plus de 75%.
 </translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
 </source>
-        <translation>%1 points : 15 points par vie</translation>
+        <translation>%1 points : 15 points par vie
+</translation>
     </message>
     <message>
         <source>%1 points: Bonus
@@ -115,15 +118,17 @@ Try to reduce total space by 75%.
 
 This program is distributed under
 the terms of the GPL v2.</source>
-        <translation>Ecrit par: Stefan Schimanski
-Porté par: Martin Imobersteg
+        <translation>Ecrit par : Stefan Schimanski
+Porté par : Martin Imobersteg
 
-Cliquez pour construire des murs.
-Espace pour changer la direction d&apos;un mur.
-Essayez de réduire l&apos;espace total de 75%.
+-&gt; Cliquez pour construire des murs.
+-&gt; Flèches pour changer la direction
+de construction des murs.
+-&gt; Le but : réduire l&apos;espace total libre
+de 75%.
 
 Ce programme est distribué sous les
-de la licence GPL v2.</translation>
+termes de la licence GPL v2.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/buttonsettings.ts b/i18n/fr/buttonsettings.ts
index 4199a77..5ae3df7 100644
--- a/i18n/fr/buttonsettings.ts
+++ b/i18n/fr/buttonsettings.ts
@@ -8,15 +8,15 @@
     </message>
     <message>
         <source>&lt;center&gt;Press or hold the button you want to remap.&lt;/center&gt;</source>
-        <translation>&lt;center&gt;Pressez et gardez appuyé le bouton que vous voulez reconfigurer.&lt;/center&gt;</translation>
+        <translation>&lt;center&gt;Pressez et gardez appuyé le bouton que vous désirez reconfigurer.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Press:</source>
-        <translation>Presser :</translation>
+        <translation>Presser : </translation>
     </message>
     <message>
         <source>Hold:</source>
-        <translation>Tenir :</translation>
+        <translation>Tenir : </translation>
     </message>
     <message>
         <source>Beam VCard</source>
@@ -36,11 +36,11 @@
     </message>
     <message>
         <source>Show Desktop</source>
-        <translation>Montrer Bureau</translation>
+        <translation>Afficher Bureau</translation>
     </message>
     <message>
         <source>Toggle Recording</source>
-        <translation>Sélectionner l&apos;Enregistrement</translation>
+        <translation>Sélectionner Enregistrement</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Ignored&lt;/nobr&gt;</source>
@@ -48,15 +48,15 @@
     </message>
     <message>
         <source>&lt;nobr&gt;Show &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</source>
-        <translation>&lt;nobr&gt;Montrer &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</translation>
+        <translation>&lt;nobr&gt;Ouvrir &lt;b&gt;%1&lt;/b&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
-        <translation>&lt;nobr&gt;Appeler &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</translation>
+        <translation>&lt;nobr&gt;Lancer &lt;b&gt;%1&lt;/b&gt;: &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</translation>
     </message>
     <message>
         <source>&lt;nobr&gt;Call &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</source>
-        <translation>&lt;nobr&gt;Appeler &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</translation>
+        <translation>&lt;nobr&gt;Lancer &lt;b&gt;%1&lt;/b&gt; &lt;i&gt;%2&lt;/i&gt;&lt;/nobr&gt;</translation>
     </message>
 </context>
 <context>
@@ -92,7 +92,7 @@
     </message>
     <message>
         <source>Show</source>
-        <translation>Montrer</translation>
+        <translation>Afficher</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/fr/buzzword.ts b/i18n/fr/buzzword.ts
index 0224777..4a2dff6 100644
--- a/i18n/fr/buzzword.ts
+++ b/i18n/fr/buzzword.ts
@@ -12,7 +12,7 @@
     </message>
     <message>
         <source>&amp;Game</source>
-        <translation>&amp;Jeux</translation>
+        <translation>&amp;Jeu</translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
diff --git a/i18n/fr/calculator.ts b/i18n/fr/calculator.ts
index e56e0f2..460ac88 100644
--- a/i18n/fr/calculator.ts
+++ b/i18n/fr/calculator.ts
@@ -134,4 +134,203 @@
         <translation>Standard</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation>Masse</translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation>Distance</translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation>Surface</translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation>Températures</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation>acres</translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation>°C</translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation>carats</translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation>cm^3</translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation>ft^3</translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation>in^3</translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation>°F</translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation>fl oz (US)</translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation>ft</translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation>g</translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation>gal (US)</translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation>hectares</translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation>in</translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation>Kg</translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation>Km</translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation>l</translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation>lb</translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation>Lg tons</translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation>mg</translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation>mi</translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation>ml</translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation>mm</translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation>naut. mi</translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation>oz</translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation>points</translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation>pt</translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation>qt</translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation>cm^2</translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation>ft^2</translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation>in^2</translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation>Km^2</translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation>m^2</translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation>mi^2</translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation>mm^2</translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation>yd^2</translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation>st</translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation>St tons</translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation>tblspoon</translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation>teaspoons</translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation>tonnes</translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation>yd</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/checkbook.ts b/i18n/fr/checkbook.ts
index dfa5c8a..20434bf 100644
--- a/i18n/fr/checkbook.ts
+++ b/i18n/fr/checkbook.ts
@@ -24,7 +24,7 @@
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation>Nom : </translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
@@ -32,7 +32,7 @@
     </message>
     <message>
         <source>Type:</source>
-        <translation>Type :</translation>
+        <translation>Type : </translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
@@ -64,7 +64,7 @@
     </message>
     <message>
         <source>Bank:</source>
-        <translation>Banque :</translation>
+        <translation>Banque : </translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
@@ -72,7 +72,7 @@
     </message>
     <message>
         <source>Account number:</source>
-        <translation>N° compte :</translation>
+        <translation>N° compte : </translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
@@ -80,7 +80,7 @@
     </message>
     <message>
         <source>PIN number:</source>
-        <translation>N° PIN :</translation>
+        <translation>N° PIN : </translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
@@ -88,7 +88,7 @@
     </message>
     <message>
         <source>Starting balance:</source>
-        <translation>Solde :</translation>
+        <translation>Solde : </translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
@@ -96,7 +96,7 @@
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notes :</translation>
+        <translation>Notes : </translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
@@ -208,7 +208,7 @@ Pour trier la liste par rapport à un champ spécifique, cliquez sur le nom de l
     </message>
     <message>
         <source>Please enter your password:</source>
-        <translation>Veuillez entrer votre mot de passe :</translation>
+        <translation>Veuillez entrer votre mot de passe : </translation>
     </message>
     <message>
         <source>Confirm password</source>
@@ -216,11 +216,11 @@ Pour trier la liste par rapport à un champ spécifique, cliquez sur le nom de l
     </message>
     <message>
         <source>Please confirm your password:</source>
-        <translation>Veuillez confirmer votre mot de passe :</translation>
+        <translation>Veuillez confirmer votre mot de passe : </translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
-        <translation>Veuillez entrer votre mot de passe pour confirmer la désactivation de la protection par mot de passe :</translation>
+        <translation>Veuillez entrer votre mot de passe pour confirmer la désactivation de la protection par mot de passe : </translation>
     </message>
 </context>
 <context>
@@ -231,7 +231,7 @@ Pour trier la liste par rapport à un champ spécifique, cliquez sur le nom de l
     </message>
     <message>
         <source>Enter currency symbol:</source>
-        <translation>Entrer le symbole de la devise :</translation>
+        <translation>Entrer le symbole de la devise : </translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
@@ -329,7 +329,7 @@ Vous pouvez aussi cliquer sur &quot;Supprimer&quot; à partir du menu de &quot;L
     </message>
     <message>
         <source>Please enter your password:</source>
-        <translation>Veuillez entrer un mot de passe :</translation>
+        <translation>Veuillez entrer un mot de passe : </translation>
     </message>
 </context>
 <context>
@@ -360,7 +360,7 @@ Vous pouvez aussi cliquer sur &quot;Supprimer&quot; à partir du menu de &quot;L
     </message>
     <message>
         <source>Number:</source>
-        <translation>Numéro :</translation>
+        <translation>Numéro : </translation>
     </message>
     <message>
         <source>Enter check number here.</source>
@@ -368,7 +368,7 @@ Vous pouvez aussi cliquer sur &quot;Supprimer&quot; à partir du menu de &quot;L
     </message>
     <message>
         <source>Description:</source>
-        <translation>Description :</translation>
+        <translation>Description : </translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
@@ -376,7 +376,7 @@ Vous pouvez aussi cliquer sur &quot;Supprimer&quot; à partir du menu de &quot;L
     </message>
     <message>
         <source>Category:</source>
-        <translation>Catégorie :</translation>
+        <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
@@ -384,7 +384,7 @@ Vous pouvez aussi cliquer sur &quot;Supprimer&quot; à partir du menu de &quot;L
     </message>
     <message>
         <source>Type:</source>
-        <translation>Type :</translation>
+        <translation>Type : </translation>
     </message>
     <message>
         <source>Select transaction type here.
@@ -396,7 +396,7 @@ Les options disponibles varient suivant le type d&apos;opération : débit ou cr
     </message>
     <message>
         <source>Amount:</source>
-        <translation>Montant :</translation>
+        <translation>Montant : </translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
@@ -408,7 +408,7 @@ La valeur entrée devrait toujours être positive.</translation>
     </message>
     <message>
         <source>Fee:</source>
-        <translation>Frais :</translation>
+        <translation>Frais : </translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
@@ -420,7 +420,7 @@ La valeur entrée devrait toujours être positive.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notes :</translation>
+        <translation>Notes : </translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
diff --git a/i18n/fr/citytime.ts b/i18n/fr/citytime.ts
index e859999..b554f25 100644
--- a/i18n/fr/citytime.ts
+++ b/i18n/fr/citytime.ts
@@ -58,7 +58,8 @@
     </message>
     <message>
         <source>Select a continent/country here, then select a city</source>
-        <translation>Sélectionnez un continent ou pays ici, puis sélectionnez une ville</translation>
+        <translation>Sélectionnez un continent ou pays ici,
+puis sélectionnez une ville</translation>
     </message>
     <message>
         <source>City</source>
diff --git a/i18n/fr/clock.ts b/i18n/fr/clock.ts
index feecf66..6d107f7 100644
--- a/i18n/fr/clock.ts
+++ b/i18n/fr/clock.ts
@@ -12,7 +12,7 @@
     </message>
     <message>
         <source>Stopwatch</source>
-        <translation>Chronomètre</translation>
+        <translation>Chrono</translation>
     </message>
     <message>
         <source>Start</source>
@@ -20,11 +20,11 @@
     </message>
     <message>
         <source>Reset</source>
-        <translation>Mettre à zéro</translation>
+        <translation>Initialiser</translation>
     </message>
     <message>
         <source>Set Alarm</source>
-        <translation>Définir l&apos;alarme</translation>
+        <translation>Définir Alarme</translation>
     </message>
     <message>
         <source>Stop</source>
@@ -44,7 +44,7 @@
     </message>
     <message>
         <source>Set date and time.</source>
-        <translation>Paramétrer la date et l&apos;heure.</translation>
+        <translation>Paramétrer Date et Heure.</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
@@ -80,12 +80,12 @@
     <message>
         <source>Snooze Delay
 (minutes)</source>
-        <translation>Délai avant Sonnerie
-(minutes)</translation>
+        <translation>Délai avant
+Sonnerie (mn)</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
-        <translation>alarme mp3</translation>
+        <translation>Alarme mp3</translation>
     </message>
     <message>
         <source>All</source>
diff --git a/i18n/fr/confedit.ts b/i18n/fr/confedit.ts
index 5572bfa..cad53d8 100644
--- a/i18n/fr/confedit.ts
+++ b/i18n/fr/confedit.ts
@@ -4,19 +4,19 @@
     <name>EditWidget</name>
     <message>
         <source>File Name:</source>
-        <translation>Nom Fichier :</translation>
+        <translation>Nom Fichier : </translation>
     </message>
     <message>
         <source>Group:</source>
-        <translation>Groupe :</translation>
+        <translation>Groupe : </translation>
     </message>
     <message>
         <source>Key:</source>
-        <translation>Clé :</translation>
+        <translation>Clé : </translation>
     </message>
     <message>
         <source>Value:</source>
-        <translation>Valeur :</translation>
+        <translation>Valeur : </translation>
     </message>
 </context>
 <context>
@@ -35,7 +35,7 @@
     </message>
     <message>
         <source> could not be opened.</source>
-        <translation>ne peut être ouvert.</translation>
+        <translation>ne peut pas être ouvert.</translation>
     </message>
 </context>
 <context>
@@ -61,7 +61,7 @@
     <name>MainWindow</name>
     <message>
         <source>Conf File Editor</source>
-        <translation>Editeur de fichier conf</translation>
+        <translation>Editeur Fichier Conf</translation>
     </message>
     <message>
         <source>Save</source>
diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index 26b4deb..452dd4f 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -4,7 +4,7 @@
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
-        <translation>Calendrier</translation>
+        <translation>Agenda</translation>
     </message>
     <message>
         <source>New</source>
@@ -16,7 +16,8 @@
     </message>
     <message>
         <source>Day</source>
-        <translation>Jour</translation>
+        <translation>Toute la
+Journée</translation>
     </message>
     <message>
         <source>Week</source>
@@ -50,7 +51,7 @@ que l&apos;intervalle entre les répétitions.</translation>
     </message>
     <message>
         <source> minutes)</source>
-        <translation>minutes)</translation>
+        <translation> minutes)</translation>
     </message>
     <message>
         <source>OK</source>
@@ -66,15 +67,15 @@ your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
-        <translation>L&apos;application n&apos;a pas été capable de sauver
-vos modifications.
+        <translation>L&apos;application n&apos;a pas été capable
+de sauvegarder vos modifications.
 Libérer de l&apos;espace et réessayer.
 
 Quitter ?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
-        <translation>(inconnu)</translation>
+        <translation>(indéfini)</translation>
     </message>
     <message>
         <source>Error!</source>
@@ -179,7 +180,7 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation>Transmettre</translation>
+        <translation>Emettre</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
@@ -199,7 +200,7 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
-        <translation>Emettre cet élément</translation>
+        <translation>Emettre cette occurence</translation>
     </message>
 </context>
 <context>
@@ -226,7 +227,7 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Calendar</source>
-        <translation>Calendrier</translation>
+        <translation>Agenda</translation>
     </message>
 </context>
 <context>
@@ -241,7 +242,7 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Start Time:</source>
-        <translation>Heure de début :</translation>
+        <translation>Heure de début : </translation>
     </message>
     <message>
         <source>:00</source>
@@ -249,15 +250,15 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
-        <translation>Paramètres de l&apos;alarme</translation>
+        <translation>Paramètres des alarmes</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
-        <translation>Paramètres par défaut </translation>
+        <translation>Par défaut</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>minutes</translation>
+        <translation> mn</translation>
     </message>
     <message>
         <source>Misc</source>
@@ -265,7 +266,7 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Row style:</source>
-        <translation>Style de lignes :</translation>
+        <translation>Style de lignes : </translation>
     </message>
     <message>
         <source>Default</source>
@@ -273,19 +274,20 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation>Moyen</translation>
+        <translation>Moyenne</translation>
     </message>
     <message>
         <source>Large</source>
-        <translation>Grand</translation>
+        <translation>Grande</translation>
     </message>
     <message>
         <source>Views</source>
-        <translation>Vues</translation>
+        <translation>Affichage</translation>
     </message>
     <message>
         <source>Default view:</source>
-        <translation>Vue par défaut :</translation>
+        <translation>Démarrer 
+dans : </translation>
     </message>
     <message>
         <source>Day</source>
@@ -297,7 +299,7 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Week List</source>
-        <translation>List des semaines</translation>
+        <translation>Liste Semaine</translation>
     </message>
     <message>
         <source>Month</source>
@@ -309,11 +311,11 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Time display</source>
-        <translation>Affichage de l&apos;heure</translation>
+        <translation>Afficher heure</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Aucun</translation>
+        <translation>Non</translation>
     </message>
     <message>
         <source>Start</source>
@@ -337,11 +339,11 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation>Maison</translation>
+        <translation>Domicile</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Catégorie :</translation>
+        <translation>Catégorie : </translation>
     </message>
 </context>
 <context>
@@ -370,7 +372,7 @@ Quitter ?</translation>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation>LMMJVSDL</translation>
+        <translation type="obsolete">LMMJVSDL</translation>
     </message>
 </context>
 <context>
@@ -437,7 +439,7 @@ Quitter ?</translation>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
-        <translation>Calendrier</translation>
+        <translation>Agenda</translation>
     </message>
     <message>
         <source>Repeat...</source>
@@ -445,7 +447,7 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Daily...</source>
-        <translation>Quotidien...</translation>
+        <translation>Quotidienne...</translation>
     </message>
     <message>
         <source>Weekly...</source>
@@ -453,11 +455,11 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Monthly...</source>
-        <translation>Mensuel...</translation>
+        <translation>Mensuelle...</translation>
     </message>
     <message>
         <source>Yearly...</source>
-        <translation>Annuel...</translation>
+        <translation>Annuelle...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
@@ -465,13 +467,13 @@ Quitter ?</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation>Heure 
-de début</translation>
+        <translation>Heure de
+début</translation>
     </message>
     <message>
         <source>End Time</source>
-        <translation>Heure 
-de fin</translation>
+        <translation>Heure de
+fin</translation>
     </message>
 </context>
 <context>
@@ -510,7 +512,7 @@ de fin</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation>Maison</translation>
+        <translation>Domicile</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
@@ -518,16 +520,18 @@ de fin</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Heure
-Minutes</translation>
+        <translation type="obsolete">Heure
+de début</translation>
     </message>
     <message>
         <source>All day</source>
-        <translation>Jour</translation>
+        <translation>Toute la
+Journée</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zone
+Horaire
 </translation>
     </message>
     <message>
@@ -536,19 +540,19 @@ Minutes</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation>minutes</translation>
+        <translation> mn</translation>
     </message>
     <message>
         <source>Silent</source>
-        <translation>Silencieux</translation>
+        <translation>Muette</translation>
     </message>
     <message>
         <source>Loud</source>
-        <translation>Fort</translation>
+        <translation>Forte</translation>
     </message>
     <message>
         <source>Repeat</source>
-        <translation>Répéter</translation>
+        <translation>Répétition</translation>
     </message>
     <message>
         <source>No Repeat...</source>
@@ -564,7 +568,12 @@ Minutes</translation>
     </message>
     <message>
         <source>Note...</source>
-        <translation>Notes...</translation>
+        <translation>Note...</translation>
+    </message>
+    <message>
+        <source>Start Time</source>
+        <translation>Heure de
+début</translation>
     </message>
 </context>
 <context>
@@ -578,7 +587,7 @@ Minutes</translation>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
-        <translation>Editer la note</translation>
+        <translation>Note</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
@@ -597,23 +606,23 @@ Minutes</translation>
     </message>
     <message>
         <source>Every</source>
-        <translation>Tout</translation>
+        <translation>Chaque</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
-        <translation>%1 %2 tout</translation>
+        <translation>Le %2 %1 chaque </translation>
     </message>
     <message>
         <source>The %1 every </source>
-        <translation>Tout les %1</translation>
+        <translation>Tous les %1 de chaque </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
-        <translation>Les %1 %1 de chaque</translation>
+        <translation>Les %2 %1 de chaque </translation>
     </message>
     <message>
         <source>Every </source>
-        <translation>Tout</translation>
+        <translation>Chaque</translation>
     </message>
     <message>
         <source>Monday</source>
@@ -648,19 +657,19 @@ Minutes</translation>
     <name>QWidget</name>
     <message>
         <source>st</source>
-        <translation>er</translation>
+        <translation>,</translation>
     </message>
     <message>
         <source>nd</source>
-        <translation>ème</translation>
+        <translation>,</translation>
     </message>
     <message>
         <source>rd</source>
-        <translation>ème</translation>
+        <translation>,</translation>
     </message>
     <message>
         <source>th</source>
-        <translation>ème</translation>
+        <translation>,</translation>
     </message>
 </context>
 <context>
@@ -723,32 +732,32 @@ Minutes</translation>
     </message>
     <message>
         <source> and </source>
-        <translation>et</translation>
+        <translation> et </translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
-et</translation>
+et </translation>
     </message>
     <message>
         <source>, and </source>
-        <translation>, et</translation>
+        <translation>, et </translation>
     </message>
     <message>
         <source>on </source>
-        <translation>activé</translation>
+        <translation>Les </translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
-        <translation>Evénement qui se répète</translation>
+        <translation>Repétition</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Aucun</translation>
+        <translation>Aucune</translation>
     </message>
     <message>
         <source>Day</source>
@@ -764,11 +773,11 @@ et</translation>
     </message>
     <message>
         <source>Year</source>
-        <translation>année</translation>
+        <translation>Année</translation>
     </message>
     <message>
         <source>Every:</source>
-        <translation>Tout :</translation>
+        <translation>Chaque : </translation>
     </message>
     <message>
         <source>Frequency</source>
@@ -776,15 +785,16 @@ et</translation>
     </message>
     <message>
         <source>End On:</source>
-        <translation>Fin le :</translation>
+        <translation>Fin le : </translation>
     </message>
     <message>
         <source>No End Date</source>
-        <translation>Pas de date de fin</translation>
+        <translation>Pas de date
+de fin</translation>
     </message>
     <message>
         <source>Repeat On</source>
-        <translation>Répéter le</translation>
+        <translation>Répéter Le</translation>
     </message>
     <message>
         <source>Mon</source>
@@ -816,7 +826,7 @@ et</translation>
     </message>
     <message>
         <source>Every</source>
-        <translation>Tout</translation>
+        <translation>Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
diff --git a/i18n/fr/drawpad.ts b/i18n/fr/drawpad.ts
index fa13f5f..f8313c0 100644
--- a/i18n/fr/drawpad.ts
+++ b/i18n/fr/drawpad.ts
@@ -230,14 +230,14 @@ toutes les pages ?</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
-        <translation>DrawPad - Page %1/%2</translation>
+        <translation>Dessin - Page %1/%2</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
-        <translation>Sélection Pages</translation>
+        <translation>Sélection Page</translation>
     </message>
     <message>
         <source>All</source>
@@ -253,7 +253,7 @@ toutes les pages ?</translation>
     </message>
     <message>
         <source>To:</source>
-        <translation>A :</translation>
+        <translation>A : </translation>
     </message>
     <message>
         <source>Export As</source>
@@ -261,15 +261,15 @@ toutes les pages ?</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation>Nom : </translation>
     </message>
     <message>
         <source>Format:</source>
-        <translation>Format :</translation>
+        <translation>Format : </translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
-        <translation>DrawPad - Exporter</translation>
+        <translation>Dessin - Exporter</translation>
     </message>
     <message>
         <source>All Images</source>
@@ -288,7 +288,7 @@ toutes les pages ?</translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
-        <translation>DrawPad - Importer</translation>
+        <translation>Dessin - Importer</translation>
     </message>
     <message>
         <source>All images</source>
@@ -311,7 +311,7 @@ toutes les pages ?</translation>
     </message>
     <message>
         <source>Pen Color</source>
-        <translation>Couleur de Pinceau</translation>
+        <translation>Couleur du Pinceau</translation>
     </message>
     <message>
         <source>Fill Color</source>
@@ -319,11 +319,11 @@ toutes les pages ?</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Général</translation>
+        <translation>Générale</translation>
     </message>
     <message>
         <source>Title:</source>
-        <translation>Titre :</translation>
+        <translation>Titre : </translation>
     </message>
     <message>
         <source>Size</source>
@@ -331,30 +331,30 @@ toutes les pages ?</translation>
     </message>
     <message>
         <source>Width:</source>
-        <translation>Largeur :</translation>
+        <translation>Largeur : </translation>
     </message>
     <message>
         <source>Height:</source>
-        <translation>Hauteur :</translation>
+        <translation>Hauteur : </translation>
     </message>
 </context>
 <context>
     <name>PageInformationDialog</name>
     <message>
         <source>Page Information</source>
-        <translation>Informations sur la page</translation>
+        <translation>Informations Page</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Général</translation>
+        <translation>Générale</translation>
     </message>
     <message>
         <source>Title:</source>
-        <translation>Titre :</translation>
+        <translation>Titre : </translation>
     </message>
     <message>
         <source>Date:</source>
-        <translation>Date :</translation>
+        <translation>Date : </translation>
     </message>
     <message>
         <source>Size</source>
@@ -362,11 +362,11 @@ toutes les pages ?</translation>
     </message>
     <message>
         <source>Width:</source>
-        <translation>Largeur :</translation>
+        <translation>Largeur : </translation>
     </message>
     <message>
         <source>Height:</source>
-        <translation>Hauteur :</translation>
+        <translation>Hauteur : </translation>
     </message>
 </context>
 <context>
@@ -395,7 +395,7 @@ toutes les pages ?</translation>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
-        <translation>DrawPad - Vue miniature</translation>
+        <translation>Dessin - Vue miniature</translation>
     </message>
     <message>
         <source>Clear Page</source>
diff --git a/i18n/fr/embeddedkonsole.ts b/i18n/fr/embeddedkonsole.ts
index 58c5f4d..676d6fa 100644
--- a/i18n/fr/embeddedkonsole.ts
+++ b/i18n/fr/embeddedkonsole.ts
@@ -11,34 +11,34 @@
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
-        <translation>Commandes</translation>
+        <translation>Editer Commandes</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
-        <translation>&lt;B&gt;Commandes&lt;/B&gt; :</translation>
+        <translation>&lt;B&gt;Commandes de l&apos;actuelle liste&lt;/B&gt; : </translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
-        <translation>&lt;B&gt;Commandes Suggérées&lt;/B&gt; :</translation>
+        <translation>&lt;B&gt;Autres commandes suggérées&lt;/B&gt; : </translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
-        <translation>Terminal</translation>
+        <translation>Konsole</translation>
     </message>
     <message>
         <source>Micro</source>
-        <translation>Micro</translation>
+        <translation>Petite</translation>
     </message>
     <message>
         <source>Small Fixed</source>
-        <translation>Petite Fixé</translation>
+        <translation>Moyenne</translation>
     </message>
     <message>
         <source>Medium Fixed</source>
-        <translation>Moyenne Fixé</translation>
+        <translation>Grande</translation>
     </message>
     <message>
         <source>Font</source>
@@ -78,15 +78,15 @@
     </message>
     <message>
         <source>Show command list</source>
-        <translation>Afficher liste commandes</translation>
+        <translation>Afficher liste</translation>
     </message>
     <message>
         <source>Hide command list</source>
-        <translation>Cacher liste commandes</translation>
+        <translation>Cacher liste</translation>
     </message>
     <message>
         <source>Tabs on Bottom</source>
-        <translation>Onglets en Bas</translation>
+        <translation>Onglets en Dessous</translation>
     </message>
     <message>
         <source>Green on Black</source>
@@ -146,15 +146,15 @@
     </message>
     <message>
         <source>Quick Edit</source>
-        <translation>Edition Rapide</translation>
+        <translation>Liste Editable</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Editer</translation>
+        <translation>Modifier Liste</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Aucun</translation>
+        <translation>Aucune</translation>
     </message>
     <message>
         <source>Left</source>
@@ -170,11 +170,11 @@
     </message>
     <message>
         <source>Show Command List</source>
-        <translation>Afficher Liste Commandes</translation>
+        <translation>Afficher Liste</translation>
     </message>
     <message>
         <source>Hide Command List</source>
-        <translation>Cacher Liste Commandes</translation>
+        <translation>Cacher Liste</translation>
     </message>
     <message>
         <source>Custom</source>
@@ -182,7 +182,7 @@
     </message>
     <message>
         <source>Command List</source>
-        <translation>Liste des commandes</translation>
+        <translation>Liste Commandes</translation>
     </message>
     <message>
         <source>Wrap</source>
@@ -190,11 +190,11 @@
     </message>
     <message>
         <source>Use Beep</source>
-        <translation>Utiliser les bips</translation>
+        <translation>Avertissement Sonore</translation>
     </message>
     <message>
         <source>Tabs on Top</source>
-        <translation>Onglets au dessus</translation>
+        <translation>Onglets au Dessus</translation>
     </message>
 </context>
 <context>
@@ -212,7 +212,7 @@
     </message>
     <message>
         <source>Enter command to add:</source>
-        <translation>Entrer Commande à ajouter :</translation>
+        <translation>&lt;B&gt;Entrez commande à ajouter&lt;/B&gt; : </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/fifteen.ts b/i18n/fr/fifteen.ts
index 06d43c5..aecc2440 100644
--- a/i18n/fr/fifteen.ts
+++ b/i18n/fr/fifteen.ts
@@ -12,7 +12,7 @@
     </message>
     <message>
         <source>Game</source>
-        <translation>Jeux</translation>
+        <translation>Jeu</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
@@ -33,11 +33,11 @@ Vous avez gagné !</translation>
     </message>
     <message>
         <source>R&amp;andomize Pieces</source>
-        <translation>Mél&amp;anger les Pièces</translation>
+        <translation>&amp;Mélanger les Pièces</translation>
     </message>
     <message>
         <source>&amp;Reset Pieces</source>
-        <translation>&amp;Reinitialiser les Pièces</translation>
+        <translation>&amp;Initialiser</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/formatter.ts b/i18n/fr/formatter.ts
index 3f304bd..5aae019 100644
--- a/i18n/fr/formatter.ts
+++ b/i18n/fr/formatter.ts
@@ -20,7 +20,7 @@
     </message>
     <message>
         <source>Main</source>
-        <translation>Principal</translation>
+        <translation>Option Principales</translation>
     </message>
     <message>
         <source>CAUTION:
@@ -50,7 +50,7 @@ instable!!</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation>Avancé(e)</translation>
+        <translation>Options Avancées</translation>
     </message>
     <message>
         <source>Format?!?</source>
@@ -111,8 +111,8 @@ Type inconnu</translation>
     <message>
         <source>Could not umount.
 Device is busy!</source>
-        <translation>Impossible de démonté.
-Périphérique occupé !</translation>
+        <translation>Impossible de démonter.
+Périphérique occupée !</translation>
     </message>
     <message>
         <source>Trying to format.</source>
@@ -144,7 +144,8 @@ a réussi a être monté. </translation>
     </message>
     <message>
         <source>You can now close the output window.</source>
-        <translation>Vous ne pouvez pas fermer la fenêtre &quot;sortie&quot;.</translation>
+        <translation>Vous ne pouvez pas fermer
+la fenêtre &quot;sortie&quot;.</translation>
     </message>
     <message>
         <source>Internal</source>
@@ -152,7 +153,7 @@ a réussi a être monté. </translation>
     </message>
     <message>
         <source>Storage Type : </source>
-        <translation type="obsolete">Type de Support :</translation>
+        <translation type="obsolete">Type de Support : </translation>
     </message>
     <message>
         <source>Total: %1 kB ( %d mB)
@@ -178,7 +179,8 @@ to stop functioning properly!</source>
         <translation>AVERTISSEMENT:
 Changer les paramêtres de
 cette page peut causer un
-disfonctionnement de votre système !</translation>
+disfonctionnement de votre
+système !</translation>
     </message>
     <message>
         <source>Format?</source>
@@ -190,7 +192,8 @@ with %1 filesystem?
 You will loose all data!!</source>
         <translation>
 en %1 ?
-Toutes vos données vont être effacées !!</translation>
+Toutes vos données
+vont être effacées !!</translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
diff --git a/i18n/fr/go.ts b/i18n/fr/go.ts
index f23524c..2f43494 100644
--- a/i18n/fr/go.ts
+++ b/i18n/fr/go.ts
@@ -16,7 +16,7 @@
     </message>
     <message>
         <source>Two player option</source>
-        <translation>Jeux à deux joueurs</translation>
+        <translation>Jouer à deux</translation>
     </message>
     <message>
         <source>Game</source>
diff --git a/i18n/fr/helpbrowser.ts b/i18n/fr/helpbrowser.ts
index 850a2e7..7cc2102 100644
--- a/i18n/fr/helpbrowser.ts
+++ b/i18n/fr/helpbrowser.ts
@@ -16,23 +16,23 @@
     </message>
     <message>
         <source>Add Bookmark</source>
-        <translation>Ajouter Signet</translation>
+        <translation>Ajouter Favoris</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
-        <translation>Effacer Signets</translation>
+        <translation>Effacer Favoris</translation>
     </message>
     <message>
         <source>Bookmarks</source>
-        <translation>Les Signets</translation>
+        <translation>Favoris</translation>
     </message>
     <message>
         <source>Help Browser</source>
-        <translation>Naviguer dans l&apos;Aide</translation>
+        <translation>Aide HTML</translation>
     </message>
     <message>
         <source>HelpBrowser</source>
-        <translation type="obsolete">Aide - Navigateur</translation>
+        <translation>Aide HTML</translation>
     </message>
     <message>
         <source>Go</source>
diff --git a/i18n/fr/kbill.ts b/i18n/fr/kbill.ts
index 86ed5d5..beb66f1 100644
--- a/i18n/fr/kbill.ts
+++ b/i18n/fr/kbill.ts
@@ -50,14 +50,13 @@
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;B&gt;La règle du jeu&lt;/B&gt;
-&lt;P&gt;kBill a été conçu pour être un jeu facile d&apos;accès pour tout le monde. Les années - non - les jours des essais du logiciels ont été supervisé par les meilleurs créateurs d&apos;interfaces homme/machine. Les conséquences sont là, même si l&apos;interface ne ressemble pas à celle de Macintosh. Quoi qu&apos;il en soit, il vous faudra&lt;/P&gt;
+&lt;P&gt;kBill a été conçu pour être un jeu facile d&apos;accès pour tout le monde. Les années - non - les jours des essais du logiciels ont été supervisés par les meilleurs créateurs d&apos;interfaces homme/machine. Les conséquences sont là, même si l&apos;interface ne ressemble pas à celle de Macintosh. Quoi qu&apos;il en soit, il vous faudra&lt;/P&gt;
 &lt;LI&gt;Attraper les &quot;Bill&quot; (cliquer)&lt;/LI&gt;
-&lt;LI&gt;Remettez en marche l&apos;ordinateur (cliquer)&lt;/LI&gt;
-&lt;LI&gt;Récupérer les OS volé &amp; les replacer sur leur machine d&apos;origine (cliquer-déplacer)&lt;/LI&gt;
+&lt;LI&gt;Remettez en marche les ordinateurs (un clique)&lt;/LI&gt;
+&lt;LI&gt;Récupérer les OS volés &amp; les replacer sur leur machine d&apos;origine (cliquer-déplacer)&lt;/LI&gt;
 &lt;LI&gt;Apporter des seaux pour éteindre les étincelles (cliquer-déplacer)&lt;/LI&gt;
 &lt;P&gt;Le score évolu en fonction du temps et du bon fonctionnement général du système, avec des bonifications pour le massacre des &quot;Bill&quot;.
-Et pour le reste, vous pourrez certainement trouver de vous même.&lt;/P&gt;
-Nous l&apos;avons fait donc ça doit pas être trop dur</translation>
+Et pour le reste, vous pourrez certainement trouver de vous même...&lt;/P&gt;</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/fr/kcheckers.ts b/i18n/fr/kcheckers.ts
index 854c8a6..f211a23 100644
--- a/i18n/fr/kcheckers.ts
+++ b/i18n/fr/kcheckers.ts
@@ -100,7 +100,7 @@
     </message>
     <message>
         <source>&amp;Game</source>
-        <translation>&amp;Jeux</translation>
+        <translation>&amp;Jeu</translation>
     </message>
     <message>
         <source>&amp;Skill</source>
diff --git a/i18n/fr/keypebble.ts b/i18n/fr/keypebble.ts
index 15e7ed8..b4341a6 100644
--- a/i18n/fr/keypebble.ts
+++ b/i18n/fr/keypebble.ts
@@ -97,7 +97,7 @@ sous ce compte, essayez plus tard.</translation>
     <name>KVNC</name>
     <message>
         <source>VNC Viewer</source>
-        <translation>Visualisateur VNC</translation>
+        <translation>Client VNC</translation>
     </message>
     <message>
         <source>Full Screen</source>
@@ -163,7 +163,7 @@ sous ce compte, essayez plus tard.</translation>
     <name>KVNCConnDlgBase</name>
     <message>
         <source>VNC Viewer Connection</source>
-        <translation>Connexion VNC Viewer</translation>
+        <translation>Connexion VNC</translation>
     </message>
     <message>
         <source>Server</source>
@@ -171,23 +171,23 @@ sous ce compte, essayez plus tard.</translation>
     </message>
     <message>
         <source>Show Password</source>
-        <translation>Montrer Mot de Passe</translation>
+        <translation>Montrer Code</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Mot de Passe :</translation>
+        <translation>Mot de Passe : </translation>
     </message>
     <message>
         <source>Bookmark Name:</source>
-        <translation>Nom du Favori :</translation>
+        <translation>Nom du Favori : </translation>
     </message>
     <message>
         <source>Host Name:</source>
-        <translation>Nom d&apos;Hôte :</translation>
+        <translation>Nom d&apos;Hôte : </translation>
     </message>
     <message>
         <source>Display Number:</source>
-        <translation>Numéro d&apos;écran :</translation>
+        <translation>Numéro écran : </translation>
     </message>
     <message>
         <source>Options</source>
@@ -195,7 +195,7 @@ sous ce compte, essayez plus tard.</translation>
     </message>
     <message>
         <source>Check for screen updates every:</source>
-        <translation>Vérifier mise à jour de l&apos;écran toutes les :</translation>
+        <translation>Vérifier mise à jour écran toutes les : </translation>
     </message>
     <message>
         <source>Milliseconds</source>
@@ -247,7 +247,7 @@ sous ce compte, essayez plus tard.</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
-        <translation>Encodage Copie de Rectangle</translation>
+        <translation>Copie de Rectangle</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
diff --git a/i18n/fr/kpacman.ts b/i18n/fr/kpacman.ts
index 182a9da..c520fe8 100644
--- a/i18n/fr/kpacman.ts
+++ b/i18n/fr/kpacman.ts
@@ -16,7 +16,7 @@
     </message>
     <message>
         <source>Change Direction Keys</source>
-        <translation>Changer les touches de direction</translation>
+        <translation>Changer Touches de Direction</translation>
     </message>
     <message>
         <source>Undefined key</source>
@@ -35,7 +35,7 @@
     </message>
     <message>
         <source>&amp;Hall of fame</source>
-        <translation>&amp;Hall of fame</translation>
+        <translation>&amp;La Salle de Renom</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -134,7 +134,7 @@ ou est dans un format inconnu.</translation>
     </message>
     <message>
         <source>READY!</source>
-        <translation>PRET!</translation>
+        <translation>PRET !</translation>
     </message>
     <message>
         <source>PAUSED</source>
@@ -190,7 +190,7 @@ ou est dans un format inconnu.</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
-        <translation>CLIQUEZ POUR DEMARRER</translation>
+        <translation>TOUCHE DE DIRECTION DEMARRER</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/fr/language.ts b/i18n/fr/language.ts
index 373b93d..9a88cf9 100644
--- a/i18n/fr/language.ts
+++ b/i18n/fr/language.ts
@@ -15,11 +15,11 @@
     <name>LanguageSettingsBase</name>
     <message>
         <source>Select language</source>
-        <translation>Sélectionner une langue</translation>
+        <translation>Sélectionnez une langue</translation>
     </message>
     <message>
         <source>Language Settings</source>
-        <translation>Configurer la langue</translation>
+        <translation>Langue</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/launchersettings.ts b/i18n/fr/launchersettings.ts
index fd78d3d..06bd0fc 100644
--- a/i18n/fr/launchersettings.ts
+++ b/i18n/fr/launchersettings.ts
@@ -23,7 +23,7 @@
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
-        <translation>Afficher ces icônes dans le menu O :</translation>
+        <translation>Afficher ces icônes dans le menu O : </translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
@@ -100,7 +100,7 @@
     </message>
     <message>
         <source>Type:</source>
-        <translation>Type :</translation>
+        <translation>Type : </translation>
     </message>
     <message>
         <source>Ruled</source>
@@ -124,7 +124,7 @@
     </message>
     <message>
         <source>Size:</source>
-        <translation>Taille :</translation>
+        <translation>Taille : </translation>
     </message>
     <message>
         <source>Small</source>
@@ -136,14 +136,14 @@
     </message>
     <message>
         <source>Color:</source>
-        <translation>Couleur :</translation>
+        <translation>Couleur : </translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
-        <translation>Onglets du bureau :</translation>
+        <translation>Onglets du bureau : </translation>
     </message>
     <message>
         <source>foobar</source>
@@ -214,7 +214,7 @@
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
-        <translation>Afficher ces icônes dans la barre des tâches :</translation>
+        <translation>Afficher ces icônes dans la barre des tâches : </translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
diff --git a/i18n/fr/libbatteryapplet.ts b/i18n/fr/libbatteryapplet.ts
index ca9d455..e9dadb1 100644
--- a/i18n/fr/libbatteryapplet.ts
+++ b/i18n/fr/libbatteryapplet.ts
@@ -8,11 +8,11 @@
     </message>
     <message>
         <source>Percentage battery remaining</source>
-        <translation>Pourcentage de batterie restant</translation>
+        <translation>Pourcentage de batterie chargé </translation>
     </message>
     <message>
         <source>Battery status: </source>
-        <translation>Niveau de la batterie :</translation>
+        <translation>Niveau batterie : </translation>
     </message>
     <message>
         <source>Good</source>
@@ -40,7 +40,7 @@
     </message>
     <message>
         <source>Power on-line</source>
-        <translation>Adaptateur secteur</translation>
+        <translation>Adaptateur secteur connecté</translation>
     </message>
     <message>
         <source>External power disconnected</source>
@@ -48,7 +48,7 @@
     </message>
     <message>
         <source>Battery time remaining</source>
-        <translation>Durée de batterie restante</translation>
+        <translation>Durée de batterie restante </translation>
     </message>
     <message>
         <source>Close</source>
@@ -72,15 +72,27 @@
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation>Pourcentage de batterie restant :</translation>
+        <translation>Pourcentage de batterie chargé : </translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation>Temps restant de la batterie :</translation>
+        <translation>Temps restant de la batterie : </translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
-        <translation>Aucune module d&apos;extention avec batterie présent</translation>
+        <translation>Aucune module avec batterie</translation>
+    </message>
+    <message>
+        <source>no data</source>
+        <translation>Aucune donné</translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation>iPaq </translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation>Jaquette </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libcardmonapplet.ts b/i18n/fr/libcardmonapplet.ts
index b6af2e5..2a1dda5 100644
--- a/i18n/fr/libcardmonapplet.ts
+++ b/i18n/fr/libcardmonapplet.ts
@@ -12,11 +12,11 @@
     </message>
     <message>
         <source>New card: </source>
-        <translation>Nouvelle carte :</translation>
+        <translation>Nouvelle carte : </translation>
     </message>
     <message>
         <source>Ejected: </source>
-        <translation>Ejecté :</translation>
+        <translation>Ejecté : </translation>
     </message>
     <message>
         <source>Eject SD/MMC card</source>
diff --git a/i18n/fr/libhomeapplet.ts b/i18n/fr/libhomeapplet.ts
index c0b36cd..f6b84f3 100644
--- a/i18n/fr/libhomeapplet.ts
+++ b/i18n/fr/libhomeapplet.ts
@@ -4,7 +4,7 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
-        <translation>Raccouci &quot;Home&quot;</translation>
+        <translation>Applet Home</translation>
     </message>
     <message>
         <source>Desktop</source>
diff --git a/i18n/fr/libirdaapplet.ts b/i18n/fr/libirdaapplet.ts
index a406021..8445146 100644
--- a/i18n/fr/libirdaapplet.ts
+++ b/i18n/fr/libirdaapplet.ts
@@ -32,11 +32,11 @@
     </message>
     <message>
         <source>Found:</source>
-        <translation>Trouvé :</translation>
+        <translation>Trouvé : </translation>
     </message>
     <message>
         <source>Lost:</source>
-        <translation>Perdu :</translation>
+        <translation>Perdu : </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libkppp.ts b/i18n/fr/libkppp.ts
index 7e39284..c21f450 100644
--- a/i18n/fr/libkppp.ts
+++ b/i18n/fr/libkppp.ts
@@ -48,7 +48,7 @@ the account &quot;%1&quot;?</source>
     </message>
     <message>
         <source>Edit Account: </source>
-        <translation>Editer Compte :</translation>
+        <translation>Editer Compte : </translation>
     </message>
     <message>
         <source>Dial</source>
@@ -103,7 +103,7 @@ the account &quot;%1&quot;?</source>
     <name>AuthWidget</name>
     <message>
         <source>Authentication: </source>
-        <translation>Authentification :</translation>
+        <translation>Authentification : </translation>
     </message>
     <message>
         <source>Script-based</source>
@@ -148,7 +148,7 @@ sécurisé qu&apos;il procure. Si vous ne connaissez par la méthode de connexio
     </message>
     <message>
         <source>Username: </source>
-        <translation>Nom Utilisateur :</translation>
+        <translation>Nom Utilisateur : </translation>
     </message>
     <message>
         <source>Enter your username here...</source>
@@ -156,7 +156,7 @@ sécurisé qu&apos;il procure. Si vous ne connaissez par la méthode de connexio
     </message>
     <message>
         <source>Password: </source>
-        <translation>Mot de Passe :</translation>
+        <translation>Mot de Passe : </translation>
     </message>
     <message>
         <source>Enter your password here</source>
@@ -216,7 +216,7 @@ Attention à ne pas donner les droits de lecture à d&apos;autres personnes !</t
     <name>DNSWidget</name>
     <message>
         <source>Domain name:</source>
-        <translation>Nom de domaine :</translation>
+        <translation>Nom de domaine : </translation>
     </message>
     <message>
         <source>If you enter a domain name here, this domain
@@ -236,7 +236,7 @@ Laissez le champs vide pour désactiver cette fonctionnalité.</translation>
     </message>
     <message>
         <source>Configuration:</source>
-        <translation>Configuration :</translation>
+        <translation>Configuration : </translation>
     </message>
     <message>
         <source>Automatic</source>
@@ -248,7 +248,7 @@ Laissez le champs vide pour désactiver cette fonctionnalité.</translation>
     </message>
     <message>
         <source>DNS IP address:</source>
-        <translation>Adresse IP DNS :</translation>
+        <translation>Adresse IP DNS : </translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify a new DNS server to be
@@ -289,7 +289,7 @@ sélectionné de la liste des DNS</translation>
     </message>
     <message>
         <source>DNS address list:</source>
-        <translation>Liste des Adresses DNS :</translation>
+        <translation>Liste des Adresses DNS : </translation>
     </message>
     <message>
         <source>&lt;p&gt;This shows all defined DNS servers to use
@@ -344,7 +344,7 @@ dispositif &quot;%1&quot; ?</translation>
     </message>
     <message>
         <source>Edit Device: </source>
-        <translation>Editer Dispositif :</translation>
+        <translation>Editer Dispositif : </translation>
     </message>
     <message>
         <source>&amp;Device</source>
@@ -389,7 +389,7 @@ nouveaux paramêtres</translation>
     <name>DialWidget</name>
     <message>
         <source>Connection name:</source>
-        <translation>Nom de la Connexion :</translation>
+        <translation>Nom de la Connexion : </translation>
     </message>
     <message>
         <source>Type in a unique name for this connection</source>
@@ -397,7 +397,7 @@ nouveaux paramêtres</translation>
     </message>
     <message>
         <source>Phone number:</source>
-        <translation>Numéro de téléphone :</translation>
+        <translation>Numéro de téléphone : </translation>
     </message>
     <message>
         <source>&amp;Add...</source>
@@ -437,7 +437,7 @@ de composer le numéro suivant et ainsi de suite</translation>
     </message>
     <message>
         <source>Before connect:</source>
-        <translation>Avant connexion :</translation>
+        <translation>Avant connexion : </translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
@@ -454,7 +454,7 @@ de réception de fax qui utiliserait la ligne.</translation>
     </message>
     <message>
         <source>Upon connect:</source>
-        <translation>A la connexion :</translation>
+        <translation>A la connexion : </translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
@@ -470,7 +470,7 @@ Très utile pour lancer le gestionnaire d&apos;E-Mail ou de Nouvelles</translati
     </message>
     <message>
         <source>Before disconnect:</source>
-        <translation>Avant déconnexion :</translation>
+        <translation>Avant déconnexion : </translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
@@ -482,7 +482,7 @@ programme n&apos;est pas terminé.</translation>
     </message>
     <message>
         <source>Upon disconnect:</source>
-        <translation>Après déconnexion :</translation>
+        <translation>Après déconnexion : </translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
@@ -530,7 +530,7 @@ to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
     </message>
     <message>
         <source>Gateway IP address:</source>
-        <translation>Adresse IP passerelle :</translation>
+        <translation>Adresse IP passerelle : </translation>
     </message>
     <message>
         <source>Assign the default route to this gateway</source>
@@ -589,7 +589,7 @@ faites.</translation>
     </message>
     <message>
         <source>IP address:</source>
-        <translation>Adresse IP :</translation>
+        <translation>Adresse IP : </translation>
     </message>
     <message>
         <source>If your computer has a permanent internet
@@ -599,7 +599,7 @@ vous devez l&apos;entrer ici.</translation>
     </message>
     <message>
         <source>Subnet mask:</source>
-        <translation>Masque de sous réseau :</translation>
+        <translation>Masque de sous réseau : </translation>
     </message>
     <message>
         <source>&lt;p&gt;If your computer has a static Internet address,
@@ -677,11 +677,11 @@ Veuillez entrer un mot de passe</translation>
     <name>ModemWidget</name>
     <message>
         <source>Modem &amp;name:</source>
-        <translation>&amp;Nom de modem :</translation>
+        <translation>&amp;Nom de modem : </translation>
     </message>
     <message>
         <source>Modem de&amp;vice:</source>
-        <translation>&amp;Device :</translation>
+        <translation>&amp;Device : </translation>
     </message>
     <message>
         <source>This specifies the serial port your modem is attached 
@@ -701,7 +701,7 @@ sélectionner /dev/ttyIx (avec x de 0 à 9 en général).</translation>
     </message>
     <message>
         <source>&amp;Flow control:</source>
-        <translation>&amp;Controle de flux :</translation>
+        <translation>&amp;Controle de flux : </translation>
     </message>
     <message>
         <source>Hardware [CRTSCTS]</source>
@@ -728,7 +728,7 @@ En général, il s&apos;agit du controle de flux matériel RTS/CTS</translation>
     </message>
     <message>
         <source>&amp;Line termination:</source>
-        <translation>&amp;Fin de ligne :</translation>
+        <translation>&amp;Fin de ligne : </translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how AT commands are sent to your
@@ -748,7 +748,7 @@ devriez essayer un autre paramêtrage ici.
     </message>
     <message>
         <source>Co&amp;nnection speed:</source>
-        <translation>&amp;Vitesse de connexion :</translation>
+        <translation>&amp;Vitesse de connexion : </translation>
     </message>
     <message>
         <source>Specifies the speed your modem and the serial
@@ -790,7 +790,7 @@ ce type de fichier.
     </message>
     <message>
         <source>Modem timeout:</source>
-        <translation>Délai d&apos;attente :</translation>
+        <translation>Délai d&apos;attente : </translation>
     </message>
     <message>
         <source> sec</source>
@@ -809,7 +809,7 @@ La  valeur recommandée est de 30 secondes.</translation>
     <name>ModemWidget2</name>
     <message>
         <source>Busy wait:</source>
-        <translation>Attente Tonalité :</translation>
+        <translation>Attente Tonalité : </translation>
     </message>
     <message>
         <source>&amp;Wait for dial tone before dialing</source>
@@ -853,7 +853,7 @@ La valeur par défaut est 0.
     </message>
     <message>
         <source>Modem &amp;volume:</source>
-        <translation>&amp;Volume modem :</translation>
+        <translation>&amp;Volume modem : </translation>
     </message>
     <message>
         <source>Most modems have a speaker which makes
@@ -946,7 +946,7 @@ de vous envoyer ces informations</translation>
     </message>
     <message>
         <source>Argument:</source>
-        <translation>Argument :</translation>
+        <translation>Argument : </translation>
     </message>
     <message>
         <source>Add</source>
@@ -969,7 +969,7 @@ de vous envoyer ces informations</translation>
     </message>
     <message>
         <source>Enter a phone number:</source>
-        <translation>Entrer un numéro de téléphone :</translation>
+        <translation>Entrer un numéro de téléphone : </translation>
     </message>
 </context>
 <context>
diff --git a/i18n/fr/liblogoutapplet.ts b/i18n/fr/liblogoutapplet.ts
index 572a7b8..23c597d 100644
--- a/i18n/fr/liblogoutapplet.ts
+++ b/i18n/fr/liblogoutapplet.ts
@@ -4,7 +4,7 @@
     <name>LogoutApplet</name>
     <message>
         <source>Logout shortcut</source>
-        <translation>Raccouci Déconnexion</translation>
+        <translation>Applet Déconnexion</translation>
     </message>
     <message>
         <source>Logout</source>
diff --git a/i18n/fr/libmadplugin.ts b/i18n/fr/libmadplugin.ts
index 18f578c..941502c 100644
--- a/i18n/fr/libmadplugin.ts
+++ b/i18n/fr/libmadplugin.ts
@@ -28,27 +28,27 @@
     </message>
     <message>
         <source>, Track: </source>
-        <translation>, Piste :</translation>
+        <translation>, Piste : </translation>
     </message>
     <message>
         <source>Info: </source>
-        <translation>Informations :</translation>
+        <translation>Informations : </translation>
     </message>
     <message>
         <source>Name: </source>
-        <translation>Nom :</translation>
+        <translation>Nom : </translation>
     </message>
     <message>
         <source>Genre: </source>
-        <translation>Genre :</translation>
+        <translation>Genre : </translation>
     </message>
     <message>
         <source>Bitrate: </source>
-        <translation>Débit :</translation>
+        <translation>Débit : </translation>
     </message>
     <message>
         <source>URL: </source>
-        <translation>URL :</translation>
+        <translation>URL : </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libnotesapplet.ts b/i18n/fr/libnotesapplet.ts
index 4d8aa78..d313da4 100644
--- a/i18n/fr/libnotesapplet.ts
+++ b/i18n/fr/libnotesapplet.ts
@@ -20,7 +20,7 @@
     </message>
     <message>
         <source>Do you really want to&lt;BR&gt;&lt;B&gt; delete&lt;/B&gt; this note ?</source>
-        <translation>Voulez-vous &lt;BR&gt;&lt;B&gt; détruire&lt;/B&gt; cette note ?</translation>
+        <translation>Voulez-vous &lt;BR&gt;&lt;B&gt;détruire&lt;/B&gt; cette note ?</translation>
     </message>
     <message>
         <source>Yes</source>
@@ -32,7 +32,7 @@
     </message>
     <message>
         <source>Beam Out</source>
-        <translation>Envoyer</translation>
+        <translation>Emission</translation>
     </message>
     <message>
         <source>Search For...</source>
diff --git a/i18n/fr/libopie.ts b/i18n/fr/libopie.ts
index 9c79d97..89a970e 100644
--- a/i18n/fr/libopie.ts
+++ b/i18n/fr/libopie.ts
@@ -71,27 +71,27 @@
     </message>
     <message>
         <source>Sat:</source>
-        <translation>Sat :</translation>
+        <translation>Sat : </translation>
     </message>
     <message>
         <source>Val:</source>
-        <translation>Val :</translation>
+        <translation>Val : </translation>
     </message>
     <message>
         <source>Red:</source>
-        <translation>Rouge :</translation>
+        <translation>Rouge : </translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation>Vert :</translation>
+        <translation>Vert : </translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation>Bleue :</translation>
+        <translation>Bleu : </translation>
     </message>
     <message>
         <source>Alpha channel:</source>
-        <translation>Canal Apha :</translation>
+        <translation>Canal Apha : </translation>
     </message>
     <message>
         <source>Select color</source>
@@ -128,7 +128,7 @@
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation>Nom : </translation>
     </message>
 </context>
 <context>
@@ -184,11 +184,11 @@
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
-        <translation>Répéter Evènement</translation>
+        <translation>Répétition</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Sans</translation>
+        <translation>Aucune</translation>
     </message>
     <message>
         <source>Day</source>
@@ -208,7 +208,7 @@
     </message>
     <message>
         <source>Every:</source>
-        <translation>Tous les :</translation>
+        <translation>Chaque : </translation>
     </message>
     <message>
         <source>Frequency</source>
@@ -216,7 +216,7 @@
     </message>
     <message>
         <source>End On:</source>
-        <translation>Fin :</translation>
+        <translation>Fin : </translation>
     </message>
     <message>
         <source>No End Date</source>
@@ -256,7 +256,7 @@
     </message>
     <message>
         <source>Every</source>
-        <translation>Tous</translation>
+        <translation>Chaque </translation>
     </message>
     <message>
         <source>Var1</source>
@@ -311,20 +311,21 @@
     </message>
     <message>
         <source> and </source>
-        <translation>et</translation>
+        <translation> et </translation>
     </message>
     <message>
         <source>,
 and </source>
-        <translation>, et</translation>
+        <translation>,
+et </translation>
     </message>
     <message>
         <source>, and </source>
-        <translation>, et</translation>
+        <translation>, et </translation>
     </message>
     <message>
         <source>on </source>
-        <translation>activé</translation>
+        <translation>Les </translation>
     </message>
     <message>
         <source>No Repeat</source>
@@ -392,14 +393,14 @@ and </source>
     </message>
     <message>
         <source>Every</source>
-        <translation>Tous</translation>
+        <translation>Chaque </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
-        <translation>Heure :</translation>
+        <translation>Heure : </translation>
     </message>
     <message>
         <source>:</source>
@@ -407,7 +408,7 @@ and </source>
     </message>
     <message>
         <source>Pick Time:</source>
-        <translation>Choisir l&apos;Heure :</translation>
+        <translation>Choisir Heure : </translation>
     </message>
 </context>
 <context>
@@ -426,11 +427,11 @@ and </source>
     </message>
     <message>
         <source>Notes:</source>
-        <translation>Notes :</translation>
+        <translation>Notes : </translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Priorité :</translation>
+        <translation>Priorité : </translation>
     </message>
     <message>
         <source>Very high</source>
@@ -454,19 +455,19 @@ and </source>
     </message>
     <message>
         <source>Progress:</source>
-        <translation>Etat :</translation>
+        <translation>Etat : </translation>
     </message>
     <message>
         <source>Deadline:</source>
-        <translation>Délai :</translation>
+        <translation>Délai : </translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Catégorie :</translation>
+        <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Default Email: </source>
-        <translation>E-Mail par Défaut :</translation>
+        <translation>E-Mail par Défaut : </translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
@@ -474,43 +475,43 @@ and </source>
     </message>
     <message>
         <source>Office: </source>
-        <translation>Bureau :</translation>
+        <translation>Service : </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
-        <translation>Page Web (bur):</translation>
+        <translation>Page Web (bur.):</translation>
     </message>
     <message>
         <source>Business Phone: </source>
-        <translation>Téléphone (bur):</translation>
+        <translation>Tél (bur.):</translation>
     </message>
     <message>
         <source>Business Fax: </source>
-        <translation>Fax (bur):</translation>
+        <translation>Fax (bur.):</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
-        <translation>Mobile (bur):</translation>
+        <translation>Mobile (bur.):</translation>
     </message>
     <message>
         <source>Business Pager: </source>
-        <translation>Radiomessage :</translation>
+        <translation>Radiomessage : </translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (perso):&lt;/b&gt;</translation>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (dom.):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
-        <translation>Page Web (bur):</translation>
+        <translation>Page Web (bur.):</translation>
     </message>
     <message>
         <source>Home Phone: </source>
-        <translation>Téléphone (perso):</translation>
+        <translation>Téléphone (dom.):</translation>
     </message>
     <message>
         <source>Home Fax: </source>
-        <translation>Fax (perso):</translation>
+        <translation>Fax (dom.):</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
@@ -518,19 +519,19 @@ and </source>
     </message>
     <message>
         <source>All Emails: </source>
-        <translation>EMail(s) :</translation>
+        <translation>E-Mail(s) : </translation>
     </message>
     <message>
         <source>Profession: </source>
-        <translation>Profession :</translation>
+        <translation>Profession : </translation>
     </message>
     <message>
         <source>Assistant: </source>
-        <translation>Assistant(e) :</translation>
+        <translation>Assistant(e) : </translation>
     </message>
     <message>
         <source>Manager: </source>
-        <translation>Responsable :</translation>
+        <translation>Responsable : </translation>
     </message>
     <message>
         <source>Male</source>
@@ -542,55 +543,57 @@ and </source>
     </message>
     <message>
         <source>Gender: </source>
-        <translation>sexe :</translation>
+        <translation>Type : </translation>
     </message>
     <message>
         <source>Spouse: </source>
-        <translation>Epouse :</translation>
+        <translation>Epou(x|se) : </translation>
     </message>
     <message>
         <source>Birthday: </source>
-        <translation>Date de Naissance :</translation>
+        <translation>Date de Naissance : </translation>
     </message>
     <message>
         <source>Anniversary: </source>
-        <translation>Autre Anniversaire :</translation>
+        <translation>Autre Anniversaire : </translation>
     </message>
     <message>
         <source>Children: </source>
-        <translation>Enfant :</translation>
+        <translation>Enfant(s) : </translation>
     </message>
     <message>
         <source>Nickname: </source>
-        <translation>Surnom :</translation>
+        <translation>Surnom : </translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation>Lieu :</translation>
+        <translation>Lieu : </translation>
     </message>
     <message>
         <source>This is an all day event</source>
-        <translation>Cet événement couvre toute la journée</translation>
+        <translation>Cet événement couvre
+toute la journée</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
-        <translation>Cet événement couvre plusieurs jours</translation>
+        <translation>Cet événement couvre
+plusieurs jours</translation>
     </message>
     <message>
         <source>Start:</source>
-        <translation>Début :</translation>
+        <translation>Début : </translation>
     </message>
     <message>
         <source>End:</source>
-        <translation>Fin :</translation>
+        <translation>Fin : </translation>
     </message>
     <message>
         <source>Note:</source>
-        <translation>Note :</translation>
+        <translation>Note : </translation>
     </message>
     <message>
         <source>Every</source>
-        <translation>Tous</translation>
+        <translation>Chaque </translation>
     </message>
     <message>
         <source>%1 %2 every </source>
@@ -602,7 +605,7 @@ and </source>
     </message>
     <message>
         <source>The %1 %2 of every</source>
-        <translation>Le %1 %2 tous les</translation>
+        <translation>Le %2 %1 chaque </translation>
     </message>
     <message>
         <source>Every </source>
@@ -641,19 +644,19 @@ and </source>
     <name>QWidget</name>
     <message>
         <source>st</source>
-        <translation>er</translation>
+        <translation>,</translation>
     </message>
     <message>
         <source>nd</source>
-        <translation></translation>
+        <translation>,</translation>
     </message>
     <message>
         <source>rd</source>
-        <translation></translation>
+        <translation>,</translation>
     </message>
     <message>
         <source>th</source>
-        <translation></translation>
+        <translation>,</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopieobex.ts b/i18n/fr/libopieobex.ts
index d7c6b85..e9b4769 100644
--- a/i18n/fr/libopieobex.ts
+++ b/i18n/fr/libopieobex.ts
@@ -8,7 +8,7 @@
     </message>
     <message>
         <source>Sending:</source>
-        <translation type="obsolete">Envoie :</translation>
+        <translation type="obsolete">Envoie : </translation>
     </message>
     <message>
         <source>filename</source>
@@ -64,14 +64,14 @@ fichier.</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
-        <translation>&lt;p&gt;Vous avez reçu un fichier du type %1 (&lt;img src=&quot;%2&quot;&gt; )Que voulez-vous faire ?</translation>
+        <translation>&lt;p&gt;Vous avez reçu un fichier du type %1 (&lt;img src=&quot;%2&quot;&gt; ) Que voulez-vous faire ?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&lt;h1&gt;Envoie :&lt;/h1&gt;&lt;/qt&gt;</translation>
+        <translation>&lt;qt&gt;&lt;h1&gt;Emission :&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
diff --git a/i18n/fr/libqhandwriting.ts b/i18n/fr/libqhandwriting.ts
index 2bf22cb..7a928c8 100644
--- a/i18n/fr/libqhandwriting.ts
+++ b/i18n/fr/libqhandwriting.ts
@@ -23,11 +23,11 @@
     <name>HandwritingTrainer</name>
     <message>
         <source>Matched: </source>
-        <translation>Ressemblance :</translation>
+        <translation>Ressemblance : </translation>
     </message>
     <message>
         <source>Similar to: </source>
-        <translation>Similaire à :</translation>
+        <translation>Similaire à : </translation>
     </message>
     <message>
         <source>%1%</source>
@@ -95,14 +95,14 @@
     </message>
     <message>
         <source>Character:</source>
-        <translation>Caractère :</translation>
+        <translation>Caractère : </translation>
     </message>
 </context>
 <context>
     <name>QIMPenPrefBase</name>
     <message>
         <source>Multi-stroke character timeout:</source>
-        <translation>Délais d&apos;écriture des caractères multi-trait :</translation>
+        <translation>Délais d&apos;écriture des caractères multi-trait : </translation>
     </message>
     <message>
         <source>ms</source>
@@ -129,7 +129,7 @@
     </message>
     <message>
         <source>Character Profile:</source>
-        <translation>Profile du caractère :</translation>
+        <translation>Profile du caractère : </translation>
     </message>
     <message>
         <source>Preferences</source>
diff --git a/i18n/fr/libqpe.ts b/i18n/fr/libqpe.ts
index b047605..1ee56a7 100644
--- a/i18n/fr/libqpe.ts
+++ b/i18n/fr/libqpe.ts
@@ -4,11 +4,11 @@
     <name>Categories</name>
     <message>
         <source>All</source>
-        <translation>Tout</translation>
+        <translation>Toute</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Non classé</translation>
+        <translation>Non classée</translation>
     </message>
     <message>
         <source> (multi.)</source>
@@ -16,11 +16,11 @@
     </message>
     <message>
         <source>Business</source>
-        <translation>Professionel</translation>
+        <translation>Professionelle</translation>
     </message>
     <message>
         <source>Personal</source>
-        <translation>Personnel</translation>
+        <translation>Personnelle</translation>
     </message>
 </context>
 <context>
@@ -49,7 +49,7 @@
     <name>CategoryEditBase</name>
     <message>
         <source>Category Edit</source>
-        <translation>Ediion des Catégories</translation>
+        <translation>Edition des Catégories</translation>
     </message>
     <message>
         <source>Categories</source>
@@ -69,7 +69,7 @@
     </message>
     <message>
         <source>Global</source>
-        <translation>Global</translation>
+        <translation>Globale</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
@@ -112,7 +112,7 @@
     <message>
         <source>Sorry, another application is
 editing categories.</source>
-        <translation>Désolé, une autre appliation
+        <translation>Désolé, une autre application
 est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
@@ -128,7 +128,8 @@ est en train d&apos;éditer les catégories.</translation>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
-        <translation>Afficher Janvier dans l&apos;année sélectionnée</translation>
+        <translation>Afficher Janvier dans l&apos;année
+sélectionnée</translation>
     </message>
     <message>
         <source>Show the previous month</source>
@@ -140,14 +141,15 @@ est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
-        <translation>Afficher Décembre dans l&apos;année sélectionnée</translation>
+        <translation>Afficher Décembre dans l&apos;année
+sélectionnée</translation>
     </message>
 </context>
 <context>
     <name>FileSelector</name>
     <message>
         <source>Close the File Selector</source>
-        <translation>Ferme le sélecteur de fichiers</translation>
+        <translation>Fermer le sélecteur de fichiers</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
@@ -159,19 +161,21 @@ est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
-        <translation>Afficher les documents dans cette catégorie</translation>
+        <translation>Afficher les documents
+dans cette catégorie</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
-        <translation>Cliquez pour sélectionner un document de cette liste</translation>
+        <translation>Cliquez pour sélectionner un document
+de cette liste</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
-        <translation>, ou sélectionnez &lt;b&gt;Nouveau Document&lt;/b&gt; pour créer un nouveau document.</translation>
+        <translation>, ou sélectionnez &lt;b&gt;Nouveau Document&lt;/b&gt;&lt;br&gt;pour créer un nouveau document.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
-        <translation>&lt;br&gt;&lt;br&gt;Cliquez et restez appuyé pour accéder aux propriétés du document.</translation>
+        <translation>&lt;br&gt;&lt;br&gt;Cliquez et restez appuyé pour accéder&lt;br&gt;aux propriétés du document.</translation>
     </message>
 </context>
 <context>
@@ -211,11 +215,11 @@ est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation>Catégorie :</translation>
+        <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Start Search at:</source>
-        <translation>Débuter la recherche à :</translation>
+        <translation>Débuter la recherche à : </translation>
     </message>
     <message>
         <source>Dec 02 01</source>
@@ -234,15 +238,15 @@ est en train d&apos;éditer les catégories.</translation>
     <name>LnkProperties</name>
     <message>
         <source>Document View</source>
-        <translation>Vue &quot;Document&quot;</translation>
+        <translation>Vue Document</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Effacer</translation>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <source>File deletion failed.</source>
-        <translation>Echec de l&apos;effacement du fichier.</translation>
+        <translation>Echec suppression fichier.</translation>
     </message>
     <message>
         <source>Copy of </source>
@@ -254,7 +258,7 @@ est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>File copy failed.</source>
-        <translation>Echec de la copie de fichier.</translation>
+        <translation>Echec copie fichier.</translation>
     </message>
     <message>
         <source>Details</source>
@@ -262,7 +266,7 @@ est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>Moving Document failed.</source>
-        <translation>Echec lors du déplacement de fichier.</translation>
+        <translation>Echec déplacement fichier.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
@@ -281,23 +285,24 @@ est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>Comment:</source>
-        <translation>Commentaire :</translation>
+        <translation>Infos : </translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation>Type :</translation>
+        <translation>Type : </translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation>Nom : </translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation>Emplacement :</translation>
+        <translation>Emplacement : </translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
-        <translation>Chargement rapide (consomme de la mémoire)</translation>
+        <translation>Chargement rapide
+(consomme de la mémoire)</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -337,14 +342,14 @@ est en train d&apos;éditer les catégories.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
-        <translation>Utiliser une rotation personnalisée</translation>
+        <translation>Personnaliser la rotation</translation>
     </message>
 </context>
 <context>
     <name>OwnerDlg</name>
     <message>
         <source>Owner Information</source>
-        <translation>Information du Propriétaire</translation>
+        <translation>Information Propriétaire</translation>
     </message>
 </context>
 <context>
@@ -422,8 +427,8 @@ for this program.
 
 Please free up some space and
 try again.</source>
-        <translation>Un problème est survenu lors de la
-création des informations de
+        <translation>Un problème est survenu lors de
+la création des informations de
 configuration du programme.
 
 Veuillez libérer de la mémoire et 
@@ -433,9 +438,10 @@ ré-essayez.</translation>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
-        <translation>Impossible de créer les fichiers de départ
-Veuillez libérer de la mémoire avant
-d&apos;entrer des données</translation>
+        <translation>Impossible de créer les fichiers
+de départ. Veuillez libérer de la
+mémoire avant d&apos;entrer des
+données</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
@@ -487,71 +493,71 @@ Libérez de la mémoire et réessayez.</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation>Non classé</translation>
+        <translation>Non classée</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Adresse (bureau)&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Adresse (bur.)&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Adresse (Domicile)&lt;/b&gt;</translation>
+        <translation>&lt;b&gt;Adresse (Dom.)&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Email Addresses: </source>
-        <translation>Adresses de courrier électronique:</translation>
+        <translation>Adresses E-Mails : </translation>
     </message>
     <message>
         <source>Home Phone: </source>
-        <translation>Tél (dom):</translation>
+        <translation>Tél (dom): </translation>
     </message>
     <message>
         <source>Home Fax: </source>
-        <translation>Fax (dom):</translation>
+        <translation>Fax (dom): </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
-        <translation>Mobile (perso):</translation>
+        <translation>Mobile (perso.): </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
-        <translation>Page Web (perso):</translation>
+        <translation>Page Web (perso.): </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
-        <translation>Page Web (bur):</translation>
+        <translation>Page Web (bur.): </translation>
     </message>
     <message>
         <source>Office: </source>
-        <translation>Bureau :</translation>
+        <translation>Service : </translation>
     </message>
     <message>
         <source>Business Phone: </source>
-        <translation>Tél (bur):</translation>
+        <translation>Tél (bur.): </translation>
     </message>
     <message>
         <source>Business Fax: </source>
-        <translation>Fax (bur):</translation>
+        <translation>Fax (bur.): </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
-        <translation>Mobile (bur):</translation>
+        <translation>Mobile (bur.): </translation>
     </message>
     <message>
         <source>Business Pager: </source>
-        <translation>Alphapage (bur):</translation>
+        <translation>Alphapage (bur.): </translation>
     </message>
     <message>
         <source>Profession: </source>
-        <translation>Profession :</translation>
+        <translation>Profession : </translation>
     </message>
     <message>
         <source>Assistant: </source>
-        <translation>Assistant :</translation>
+        <translation>Assistant(e): </translation>
     </message>
     <message>
         <source>Manager: </source>
-        <translation>Responsable :</translation>
+        <translation>Responsable : </translation>
     </message>
     <message>
         <source>Male</source>
@@ -563,23 +569,23 @@ Libérez de la mémoire et réessayez.</translation>
     </message>
     <message>
         <source>Gender: </source>
-        <translation>Genre :</translation>
+        <translation>Type : </translation>
     </message>
     <message>
         <source>Spouse: </source>
-        <translation>Epouse :</translation>
+        <translation>Epou(x|se): </translation>
     </message>
     <message>
         <source>Birthday: </source>
-        <translation>Date de naissance :</translation>
+        <translation>Date de naissance: </translation>
     </message>
     <message>
         <source>Anniversary: </source>
-        <translation>Anniversaire :</translation>
+        <translation>Anniversaire : </translation>
     </message>
     <message>
         <source>Nickname: </source>
-        <translation>Surnom :</translation>
+        <translation>Surnom : </translation>
     </message>
     <message>
         <source>Name Title</source>
@@ -591,7 +597,7 @@ Libérez de la mémoire et réessayez.</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Second Prénom</translation>
+        <translation>2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
@@ -619,15 +625,15 @@ Libérez de la mémoire et réessayez.</translation>
     </message>
     <message>
         <source>Business Phone</source>
-        <translation>Tél (bur)</translation>
+        <translation>Tél (bur.)</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax (bur)</translation>
+        <translation>Fax (bur.)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Mobile (bur)</translation>
+        <translation>Mobile (bur.)</translation>
     </message>
     <message>
         <source>Default Email</source>
@@ -639,47 +645,47 @@ Libérez de la mémoire et réessayez.</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Tél (dom)</translation>
+        <translation>Tél (dom.)</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax (dom)</translation>
+        <translation>Fax (dom.)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Mobile (dom)</translation>
+        <translation>Mobile (dom.)</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Rue (bur)</translation>
+        <translation>Rue (bur.)</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Ville (bur)</translation>
+        <translation>Ville (bur.)</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Région (bur)</translation>
+        <translation>Région (bur.)</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Code Postal (bur)</translation>
+        <translation>Code Postal (bur.)</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Pays (bur)</translation>
+        <translation>Pays (bur.)</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Alphapage (bu)</translation>
+        <translation>Alphapage (bur.)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Page Web (bur)</translation>
+        <translation>Page Web (bur.)</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Bureau</translation>
+        <translation>Service</translation>
     </message>
     <message>
         <source>Profession</source>
@@ -695,39 +701,39 @@ Libérez de la mémoire et réessayez.</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Rue (dom)</translation>
+        <translation>Rue (dom.)</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Ville (dom)</translation>
+        <translation>Ville (dom.)</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Etat (dom)</translation>
+        <translation>Etat (dom.)</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Code Postal (dom)</translation>
+        <translation>Code Postal (dom.)</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Pays (dom)</translation>
+        <translation>Pays (dom.)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Page Web (dom)</translation>
+        <translation>Page Web (dom.)</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Epouse</translation>
+        <translation>Epou(x|se)</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Genre</translation>
+        <translation>Type</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Date de naissance</translation>
+        <translation>Date de Naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
@@ -739,7 +745,7 @@ Libérez de la mémoire et réessayez.</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Enfants</translation>
+        <translation>Enfant(s)</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -843,7 +849,7 @@ Libérez de la mémoire et réessayez.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation>Clqiuez pour rendre cette fenêtre déplaçable.</translation>
+        <translation>Cliquez pour rendre cette fenêtre déplaçable.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
@@ -863,6 +869,22 @@ Libérez de la mémoire et réessayez.</translation>
         <translation>&lt;qt&gt;Voulez-vous vraiment supprimer
 %1 ?&lt;/qt&gt;</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation>L&apos;application n&apos;a pas été trouvée</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation>L&apos;application n&apos;a pas été lancée</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
@@ -947,13 +969,14 @@ Libérez de la mémoire et réessayez.</translation>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
-        <translation>Impossible de trouver l&apos;exécutable &quot;citytime&quot;</translation>
+        <translation>Impossible de trouver l&apos;exécutable
+&quot;Heure de Ville&quot;</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
-        <translation>Pour choisir le fueau horaire,
-installez &quot;citytime&quot; SVP.</translation>
+        <translation>Pour choisir le fuseau horaire,
+installez &quot;Heure de Ville&quot; SVP.</translation>
     </message>
 </context>
 <context>
@@ -982,7 +1005,7 @@ Libérez de la mémoire et réessayez</translation>
     </message>
     <message>
         <source>All %1 files</source>
-        <translation>tous les %1 fichiers</translation>
+        <translation>Tous fichiers %1</translation>
     </message>
     <message>
         <source>All files</source>
diff --git a/i18n/fr/librotateapplet.ts b/i18n/fr/librotateapplet.ts
index c3159f1..f69d658d 100644
--- a/i18n/fr/librotateapplet.ts
+++ b/i18n/fr/librotateapplet.ts
@@ -4,7 +4,7 @@
     <name>RotateApplet</name>
     <message>
         <source>Rotate shortcut</source>
-        <translation>Raccourci Rotation </translation>
+        <translation>Applet Rotation </translation>
     </message>
     <message>
         <source>Rotate</source>
diff --git a/i18n/fr/libsuspendapplet.ts b/i18n/fr/libsuspendapplet.ts
index 816cd31..f898ad7 100644
--- a/i18n/fr/libsuspendapplet.ts
+++ b/i18n/fr/libsuspendapplet.ts
@@ -4,7 +4,7 @@
     <name>SuspendApplet</name>
     <message>
         <source>Suspend shortcut</source>
-        <translation>Raccouci de Suspendre </translation>
+        <translation>Applet Suspendre </translation>
     </message>
     <message>
         <source>Suspend</source>
diff --git a/i18n/fr/libtodayaddressbookplugin.ts b/i18n/fr/libtodayaddressbookplugin.ts
index feb2259..8ef1f52 100644
--- a/i18n/fr/libtodayaddressbookplugin.ts
+++ b/i18n/fr/libtodayaddressbookplugin.ts
@@ -20,7 +20,7 @@
     </message>
     <message>
         <source>Days look ahead: </source>
-        <translation>Jours en avant :</translation>
+        <translation>Jours en avant : </translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
@@ -32,7 +32,7 @@
     </message>
     <message>
         <source>Set Headline Color: </source>
-        <translation>Couleurs des Titres :</translation>
+        <translation>Couleurs des Titres : </translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
@@ -40,7 +40,7 @@
     </message>
     <message>
         <source>Set Entry Color: </source>
-        <translation>Couleur des Entrées :</translation>
+        <translation>Couleur des Entrées : </translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
@@ -70,23 +70,26 @@ jours</translation>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
-        <translation>Module &quot;Répertoire d&apos;Adresse&quot;</translation>
+        <translation>Module &quot;Contacts&quot;</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation>Prochaine date de naissance dans &lt;b&gt; %1 &lt;/b&gt; jours :</translation>
+        <translation>Prochain anniversaire de naissance
+prévu dans &lt;b&gt;%1&lt;/b&gt; jour(s):</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation>Pas d&apos;anniversaire dans les &lt;b&gt;%1&lt;/b&gt; prochains jours !</translation>
+        <translation>Pas d&apos;anniversaire de naissance prévu
+dans les &lt;b&gt;%1&lt;/b&gt; prochains jours !</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
-        <translation>Prochain anniversaire dans &lt;b&gt;%1&lt;/b&gt; jours :</translation>
+        <translation>Prochain anniversaire dans &lt;b&gt;%1&lt;/b&gt; jour(s):</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
-        <translation>Pas d&apos;anniversaire dans les &lt;b&gt;%1&lt;/b&gt; prochains jours !</translation>
+        <translation>Pas d&apos;anniversaire dans les &lt;b&gt;%1&lt;/b&gt;
+prochains jours !</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
diff --git a/i18n/fr/libtodaydatebookplugin.ts b/i18n/fr/libtodaydatebookplugin.ts
index b7b298b..299a50d 100644
--- a/i18n/fr/libtodaydatebookplugin.ts
+++ b/i18n/fr/libtodaydatebookplugin.ts
@@ -132,15 +132,15 @@ d&apos;évènements
     <name>QObject</name>
     <message>
         <source>Datebook plugin</source>
-        <translation>Module &quot;Agenda&quot;</translation>
+        <translation>Module Agenda</translation>
     </message>
     <message>
         <source>No more appointments today</source>
-        <translation>Plus d&apos;évènements aujourd&apos;hui</translation>
+        <translation>Aucun évènement prévu</translation>
     </message>
     <message>
         <source>No appointments today</source>
-        <translation>Pas d&apos;év��nements aujourd&apos;hui</translation>
+        <translation>Pas d&apos;év��nement aujourd&apos;hui</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libtodayfortuneplugin.ts b/i18n/fr/libtodayfortuneplugin.ts
index b2e2a6d..521fcc6 100644
--- a/i18n/fr/libtodayfortuneplugin.ts
+++ b/i18n/fr/libtodayfortuneplugin.ts
@@ -4,7 +4,7 @@
     <name>QObject</name>
     <message>
         <source>Fortune plugin</source>
-        <translation>Module &quot;Fortune&quot;</translation>
+        <translation>Plugin Fortune</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libtodaymailplugin.ts b/i18n/fr/libtodaymailplugin.ts
index 09ccd79..b104c04 100644
--- a/i18n/fr/libtodaymailplugin.ts
+++ b/i18n/fr/libtodaymailplugin.ts
@@ -8,7 +8,7 @@
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
-        <translation>&lt;b&gt;%1&lt;/b&gt;nouveau(x) message(s), &lt;b&gt;%2&lt;/b&gt; sortants</translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; nouveau(x) message(s), &lt;b&gt;%2&lt;/b&gt; sortant(s)</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libtodayweatherplugin.ts b/i18n/fr/libtodayweatherplugin.ts
index 5d9cc93..6d924f6 100644
--- a/i18n/fr/libtodayweatherplugin.ts
+++ b/i18n/fr/libtodayweatherplugin.ts
@@ -11,7 +11,7 @@
     <name>WeatherPluginConfig</name>
     <message>
         <source>Enter ICAO location identifier:</source>
-        <translation>Entrez l&apos;indentificateur de lieu ICAO :</translation>
+        <translation>Entrez l&apos;indentificateur de lieu ICAO : </translation>
     </message>
     <message>
         <source>Enter the 4 letter code for the desired location here.  See http://www.nws.noaa.gov/tg/siteloc.shtml to find a location near you.</source>
@@ -31,7 +31,7 @@
     </message>
     <message>
         <source>Update frequency (in minutes):</source>
-        <translation>Fréquence de mise à jour (en minutes) :</translation>
+        <translation>Fréquence de mise à jour (en minutes) : </translation>
     </message>
     <message>
         <source>Select how often (in minutes) you want the weather to be updated.</source>
@@ -46,16 +46,16 @@
     </message>
     <message>
         <source>Temp: </source>
-        <translation>Temps :</translation>
+        <translation>Temps : </translation>
     </message>
     <message>
         <source>  Wind: </source>
-        <translation>Vent :</translation>
+        <translation>Vent : </translation>
     </message>
     <message>
         <source>
 Pres: </source>
-        <translation>Pression :</translation>
+        <translation>Pression : </translation>
     </message>
     <message>
         <source>Current weather data not available.</source>
diff --git a/i18n/fr/libvolumeapplet.ts b/i18n/fr/libvolumeapplet.ts
index a1d568c..3a603f5 100644
--- a/i18n/fr/libvolumeapplet.ts
+++ b/i18n/fr/libvolumeapplet.ts
@@ -4,7 +4,7 @@
     <name>VolumeControl</name>
     <message>
         <source>Enable Sounds for:</source>
-        <translation>Activé le son pour :</translation>
+        <translation>Activé le son pour : </translation>
     </message>
     <message>
         <source>Alarm Sound</source>
diff --git a/i18n/fr/light-and-power.ts b/i18n/fr/light-and-power.ts
index 0dd6be3..93997ff 100644
--- a/i18n/fr/light-and-power.ts
+++ b/i18n/fr/light-and-power.ts
@@ -50,7 +50,8 @@
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
-        <translation>Désactive l&apos;écran (ne met pas veille)</translation>
+        <translation>Désactiver l&apos;écran
+(ne met pas en veille)</translation>
     </message>
     <message>
         <source>Backlight</source>
@@ -66,7 +67,8 @@
     </message>
     <message>
         <source>Use Light Sensor</source>
-        <translation>Utiliser le capteur de lumière</translation>
+        <translation>Utiliser le capteur
+de lumière</translation>
     </message>
     <message>
         <source>Calibrate</source>
@@ -86,7 +88,7 @@
     </message>
     <message>
         <source>Low power warning interval</source>
-        <translation>Message &quot;Batterie faible&quot;</translation>
+        <translation>Message Batterie faible</translation>
     </message>
     <message>
         <source> %</source>
@@ -106,11 +108,11 @@
     </message>
     <message>
         <source>very low battery warning at</source>
-        <translation>Message &quot;Batterie très faible&quot;</translation>
+        <translation>Message Batterie très faible</translation>
     </message>
     <message>
         <source>critical power warning at</source>
-        <translation>Message &quot;Batterie critique&quot;</translation>
+        <translation>Message Batterie critique</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/fr/mail.ts b/i18n/fr/mail.ts
index 3124ba0..e37b2ed 100644
--- a/i18n/fr/mail.ts
+++ b/i18n/fr/mail.ts
@@ -30,11 +30,11 @@
     </message>
     <message>
         <source>&lt;b&gt;Port:</source>
-        <translation>&lt;b&gt;Port :</translation>
+        <translation>&lt;b&gt;Port : </translation>
     </message>
     <message>
         <source>&lt;b&gt;IMAP:</source>
-        <translation>&lt;b&gt;IMAP:</translation>
+        <translation>&lt;b&gt;IMAP : </translation>
     </message>
     <message>
         <source>[--]</source>
@@ -42,15 +42,15 @@
     </message>
     <message>
         <source>&lt;b&gt;SMTP:</source>
-        <translation>&lt;b&gt;SMTP:</translation>
+        <translation>&lt;b&gt;SMTP : </translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
-        <translation>&lt;b&gt;Nom Utilisateur :</translation>
+        <translation>&lt;b&gt;Nom Utilisateur : </translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
-        <translation>&lt;b&gt;Mot de Passe :</translation>
+        <translation>&lt;b&gt;Mot de Passe : </translation>
     </message>
     <message>
         <source>Identity</source>
@@ -58,15 +58,15 @@
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
-        <translation>&lt;b&gt;Nom :</translation>
+        <translation>&lt;b&gt;Nom : </translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
-        <translation>&lt;b&gt;E-Mail :</translation>
+        <translation>&lt;b&gt;E-Mail : </translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
-        <translation>&lt;b&gt;Org. :</translation>
+        <translation>&lt;b&gt;Org. : </translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -86,7 +86,7 @@
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
-        <translation>&lt;b&gt;Signature :</translation>
+        <translation>&lt;b&gt;Signature : </translation>
     </message>
     <message>
         <source>SSL</source>
@@ -508,7 +508,7 @@ Visitez http://www.lisa.de/ pour plus d&apos;informations.</translation>
     </message>
     <message>
         <source>&lt;p&gt;Renaming failed. (Server said: %1)&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Le changement de nom a échoué. (réponse du serveur : %1)&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Le changement de nom a échoué.&lt;br&gt; (réponse du serveur : %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Deletion successfull!</source>
@@ -814,11 +814,11 @@ Visitez http://www.lisa.de/ pour plus d&apos;informations.</translation>
     </message>
     <message>
         <source>&lt;b&gt;Search&amp;nbsp;in:</source>
-        <translation>&lt;b&gt;Recherche&amp;nbsp;dans :</translation>
+        <translation>&lt;b&gt;Recherche&amp;nbsp;dans : </translation>
     </message>
     <message>
         <source>&lt;b&gt;For:</source>
-        <translation>Texte :</translation>
+        <translation>Texte : </translation>
     </message>
 </context>
 <context>
diff --git a/i18n/fr/mailit.ts b/i18n/fr/mailit.ts
index 062b245..fb8b96e 100644
--- a/i18n/fr/mailit.ts
+++ b/i18n/fr/mailit.ts
@@ -16,11 +16,11 @@
     </message>
     <message>
         <source>attach...</source>
-        <translation>attache...</translation>
+        <translation>Attacher...</translation>
     </message>
     <message>
         <source>Adding attachments</source>
-        <translation>Ajout de(s) fichier(s)</translation>
+        <translation>Ajout de fichier</translation>
     </message>
 </context>
 <context>
@@ -47,11 +47,13 @@
     </message>
     <message>
         <source>POP username</source>
-        <translation>Nom Utilisateur POP</translation>
+        <translation>Nom Utilisateur
+POP</translation>
     </message>
     <message>
         <source>POP password</source>
-        <translation>Mot de passe POP</translation>
+        <translation>Mot de passe
+POP</translation>
     </message>
     <message>
         <source>POP server</source>
@@ -67,7 +69,8 @@
     </message>
     <message>
         <source>Mail Size (k)</source>
-        <translation>Taille Messages (k)</translation>
+        <translation>Taille
+Message (Ko)</translation>
     </message>
 </context>
 <context>
@@ -86,7 +89,7 @@
     </message>
     <message>
         <source>Get Mail in</source>
-        <translation>Recevoir les messages dans</translation>
+        <translation>Recevoir Messages</translation>
     </message>
     <message>
         <source>Edit account</source>
@@ -206,6 +209,20 @@ Vérifiez le nom d&apos;utilisateur et le mot de passe&lt;/qt&gt;</translation>
         <translation>OK
 </translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation>Aucun compte Défini</translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation>Supprimer compte : 
+</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nouveau</translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
@@ -213,7 +230,7 @@ Vérifiez le nom d&apos;utilisateur et le mot de passe&lt;/qt&gt;</translation>
         <source>Could not locate all files in 
 mail with subject: </source>
         <translation>Impossible de trouver tous 
-les fichiers du message intitulé :</translation>
+les fichiers du message intitulé : </translation>
     </message>
     <message>
         <source>
@@ -447,7 +464,7 @@ Cliquez et garder la pression pour plus d&apos;options.</translation>
     </message>
     <message>
         <source>Click here to reply to the selected mail to CC: addresses also</source>
-        <translation>Cliquez ici pour répondre à toutes les personnes du message sélectionné</translation>
+        <translation>Cliquez ici pour répondre à toutes les destinataires du message</translation>
     </message>
 </context>
 <context>
@@ -462,7 +479,7 @@ Cliquez et garder la pression pour plus d&apos;options.</translation>
     </message>
     <message>
         <source>Sending: </source>
-        <translation>Envoi :</translation>
+        <translation>Envoi : </translation>
     </message>
     <message>
         <source>Sent </source>
@@ -528,15 +545,15 @@ Cliquez et garder la pression pour plus d&apos;options.</translation>
     </message>
     <message>
         <source>To:</source>
-        <translation>A :</translation>
+        <translation>A : </translation>
     </message>
     <message>
         <source>CC:</source>
-        <translation>Cc :</translation>
+        <translation>Cc : </translation>
     </message>
     <message>
         <source>Subject:</source>
-        <translation>Sujet :</translation>
+        <translation>Sujet : </translation>
     </message>
     <message>
         <source>...</source>
@@ -574,27 +591,29 @@ Cliquez et garder la pression pour plus d&apos;options.</translation>
     </message>
     <message>
         <source>Incorrect recipient separator</source>
-        <translation>Séparateur de destinataire incorrecte</translation>
+        <translation>Séparateur destinataire incorrecte</translation>
     </message>
     <message>
         <source>Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation>Les destinataires doivent être séparés par ;
-et être des adresses Emails valides</translation>
+        <translation>Les destinataires doivent être
+séparés par ; et être des
+adresses E-Mails valides</translation>
     </message>
     <message>
         <source>Incorrect carbon copy separator</source>
-        <translation>Séparateur des destinataires en copie incorrect</translation>
+        <translation>Séparateur copie carbone incorrect</translation>
     </message>
     <message>
         <source>CC Recipients must be separated by ;
 and be valid emailaddresses</source>
-        <translation>Les destinataires en copie doivent être séparés par ;
-et être des adresses Emails valides</translation>
+        <translation>Les destinataires en copie doivent
+être séparés par ; et être des
+adresses E-Mails valides</translation>
     </message>
     <message>
         <source>Re: </source>
-        <translation>Re :</translation>
+        <translation>Re : </translation>
     </message>
     <message>
         <source>======forwarded message from </source>
@@ -610,7 +629,7 @@ et être des adresses Emails valides</translation>
     </message>
     <message>
         <source>FWD: </source>
-        <translation>FWD:</translation>
+        <translation>FWD : </translation>
     </message>
     <message>
         <source>======end of forwarded message======
diff --git a/i18n/fr/mediummount.ts b/i18n/fr/mediummount.ts
index 1a8adef..0d8be40 100644
--- a/i18n/fr/mediummount.ts
+++ b/i18n/fr/mediummount.ts
@@ -132,7 +132,7 @@
     </message>
     <message>
         <source>Limit search to:</source>
-        <translation>Limiter la recherche à :</translation>
+        <translation>Limiter la recherche à : </translation>
     </message>
     <message>
         <source>Add</source>
@@ -171,7 +171,7 @@
     </message>
     <message>
         <source>Limit search to:</source>
-        <translation type="obsolete">Limiter la recherche à :</translation>
+        <translation type="obsolete">Limiter la recherche à : </translation>
     </message>
     <message>
         <source>Add</source>
diff --git a/i18n/fr/odict.ts b/i18n/fr/odict.ts
index ba46d20..8f36d6c 100644
--- a/i18n/fr/odict.ts
+++ b/i18n/fr/odict.ts
@@ -35,11 +35,11 @@
     <name>ODict</name>
     <message>
         <source>OPIE-Dictionary</source>
-        <translation>OPIE-Dictionnaire</translation>
+        <translation>Dictionnaire OPIE</translation>
     </message>
     <message>
         <source>Query:</source>
-        <translation>Requête :</translation>
+        <translation>Requête : </translation>
     </message>
     <message>
         <source>&amp;Ok</source>
@@ -95,7 +95,7 @@
     </message>
     <message>
         <source>Settings</source>
-        <translation>Configurations</translation>
+        <translation>Préférences</translation>
     </message>
     <message>
         <source>Parameter</source>
@@ -103,7 +103,7 @@
     </message>
     <message>
         <source>Opie-Dictionary</source>
-        <translation>Opie-Dictionary</translation>
+        <translation>Dictionnaire Opie</translation>
     </message>
     <message>
         <source>No dictionary defined</source>
@@ -126,7 +126,7 @@
     <name>SearchMethodDlg</name>
     <message>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation>Nom : </translation>
     </message>
     <message>
         <source>Dictionary file</source>
diff --git a/i18n/fr/opie-console.ts b/i18n/fr/opie-console.ts
index e03ae63..3077586 100644
--- a/i18n/fr/opie-console.ts
+++ b/i18n/fr/opie-console.ts
@@ -15,11 +15,11 @@
     </message>
     <message>
         <source>Init string </source>
-        <translation>Chaîne d&apos;initialisation</translation>
+        <translation>Initialisation</translation>
     </message>
     <message>
         <source>Reset string </source>
-        <translation>Chaîne de re-initialisation</translation>
+        <translation>Re-initialisation</translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>Dialing suffix #1 </source>
-        <translation>Sufixe d&apos;appel #1</translation>
+        <translation>Suffixe d&apos;appel #1</translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
@@ -43,15 +43,15 @@
     </message>
     <message>
         <source>Dialing suffix #3 </source>
-        <translation>Sufixe d&apos;appel #3</translation>
+        <translation>Suffixe d&apos;appel #3</translation>
     </message>
     <message>
         <source>Connect string </source>
-        <translation>Chaîne de connexion</translation>
+        <translation>Connexion</translation>
     </message>
     <message>
         <source>Hang-up string </source>
-        <translation>Chaîne pour raccrocher</translation>
+        <translation>Raccrocher</translation>
     </message>
     <message>
         <source>Dial time </source>
@@ -59,7 +59,7 @@
     </message>
     <message>
         <source>Delay before redial </source>
-        <translation>Delai avant rappel</translation>
+        <translation>Délai avant rappel</translation>
     </message>
     <message>
         <source>Number of tries </source>
@@ -67,11 +67,12 @@
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
-        <translation>Durée de tombé de DTR (0=non)</translation>
+        <translation>Temps de désactivation
+de DTR (0=non)</translation>
     </message>
     <message>
         <source>Auto bps detect </source>
-        <translation>Sélection automatique des bps</translation>
+        <translation>Détection auto. bps</translation>
     </message>
     <message>
         <source>No</source>
@@ -83,11 +84,11 @@
     </message>
     <message>
         <source>Modem has DCD line </source>
-        <translation>Le modem utilise DCD</translation>
+        <translation>Utiliser ligne DCD</translation>
     </message>
     <message>
         <source>Multi-line untag </source>
-        <translation>Multi-line untag</translation>
+        <translation>Untag multi-ligne</translation>
     </message>
 </context>
 <context>
@@ -105,7 +106,7 @@
     <name>ConfigDialog</name>
     <message>
         <source>Edit Connection Profile</source>
-        <translation>Editer Profile Connexion</translation>
+        <translation>Editer Profil Connexion</translation>
     </message>
     <message>
         <source>New Connection</source>
@@ -120,7 +121,7 @@
     </message>
     <message>
         <source>Profile Name</source>
-        <translation>Nom du profile</translation>
+        <translation>Nom Profil</translation>
     </message>
     <message>
         <source>&amp;Add</source>
@@ -143,7 +144,7 @@
     </message>
     <message>
         <source>Environment Variables</source>
-        <translation>Variables d&apos;Environnement</translation>
+        <translation>Variables Environnement</translation>
     </message>
     <message>
         <source>Name</source>
@@ -155,11 +156,11 @@
     </message>
     <message>
         <source>Name :</source>
-        <translation>Nom :</translation>
+        <translation>Nom : </translation>
     </message>
     <message>
         <source>Value :</source>
-        <translation>Valeur :</translation>
+        <translation>Valeur : </translation>
     </message>
     <message>
         <source>Remove</source>
@@ -174,7 +175,7 @@
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
-        <translation>Entrez un numéro</translation>
+        <translation>Entrer numéro</translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
@@ -189,11 +190,11 @@
     </message>
     <message>
         <source>Terminal Emulation:</source>
-        <translation>Emulation de Terminal :</translation>
+        <translation>Emulateur de Terminal : </translation>
     </message>
     <message>
         <source>IO Layer:</source>
-        <translation>Gestionnaire d&apos;Entrée/Sortie :</translation>
+        <translation>Gestion E/S : </translation>
     </message>
     <message>
         <source>Look</source>
@@ -201,7 +202,7 @@
     </message>
     <message>
         <source>Foreground:</source>
-        <translation>Premier plan :</translation>
+        <translation>Premier plan : </translation>
     </message>
     <message>
         <source>Black</source>
@@ -217,11 +218,11 @@
     </message>
     <message>
         <source>Background:</source>
-        <translation>Arrière plan :</translation>
+        <translation>Arrière plan : </translation>
     </message>
     <message>
         <source>Font:</source>
-        <translation>Fonte :</translation>
+        <translation>Fonte : </translation>
     </message>
     <message>
         <source>Micro</source>
@@ -240,7 +241,7 @@
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
-        <translation>Ne peut commencer</translation>
+        <translation>Ne peut démarrer</translation>
     </message>
 </context>
 <context>
@@ -251,7 +252,7 @@
     </message>
     <message>
         <source>Could not start</source>
-        <translation>Ne peut commencer</translation>
+        <translation>Ne peut démarrer</translation>
     </message>
 </context>
 <context>
@@ -262,7 +263,7 @@
     </message>
     <message>
         <source>Edit Key</source>
-        <translation>Editer la clef</translation>
+        <translation>Editer Touche</translation>
     </message>
 </context>
 <context>
@@ -273,7 +274,7 @@
     </message>
     <message>
         <source>Flow control</source>
-        <translation>Control de flux</translation>
+        <translation>Contrôle de flux</translation>
     </message>
     <message>
         <source>Hardware</source>
@@ -285,7 +286,7 @@
     </message>
     <message>
         <source>None</source>
-        <translation>Aucun</translation>
+        <translation>Aucune</translation>
     </message>
     <message>
         <source>Parity</source>
@@ -382,7 +383,7 @@
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
-        <translation>Configurer les Profiles</translation>
+        <translation>Configurer Profils</translation>
     </message>
     <message>
         <source>New Connection</source>
@@ -390,7 +391,7 @@
     </message>
     <message>
         <source>Save Connection</source>
-        <translation>Sauver Connection</translation>
+        <translation>Enregistrer Connexion</translation>
     </message>
     <message>
         <source>Connect</source>
@@ -406,7 +407,7 @@
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
-        <translation>Le buton shell lance le profile par &quot;défaut&quot;. Si non présent, les valeurs sont demandées</translation>
+        <translation>Le buton shell lance le profil par &quot;défaut&quot;. Si non présent, les valeurs sont demandées</translation>
     </message>
     <message>
         <source>Transfer file...</source>
@@ -418,19 +419,19 @@
     </message>
     <message>
         <source>Full screen</source>
-        <translation>Plein écran</translation>
+        <translation>Plein Ecran</translation>
     </message>
     <message>
         <source>Save history</source>
-        <translation>Sauver l&apos;historique</translation>
+        <translation>Enregistrer Historique</translation>
     </message>
     <message>
         <source>Terminate</source>
-        <translation>Terminer</translation>
+        <translation>Terminer Session</translation>
     </message>
     <message>
         <source>Close Window</source>
-        <translation>Fermer la Fenêtre</translation>
+        <translation>Fermer Fenêtre</translation>
     </message>
     <message>
         <source>Run Script</source>
@@ -438,19 +439,19 @@
     </message>
     <message>
         <source>Record Script</source>
-        <translation>Enregistrer Script</translation>
+        <translation>Début Enregistrement Script</translation>
     </message>
     <message>
         <source>Save Script</source>
-        <translation>Sauver Script</translation>
+        <translation>Enregistrer Script</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
-        <translation>Ouvrir le Clavier...</translation>
+        <translation>Ouvrir Clavier...</translation>
     </message>
     <message>
         <source>New from Profile</source>
-        <translation>Nouveau Profile Identique</translation>
+        <translation>Ouvrir Profil</translation>
     </message>
     <message>
         <source>Connection</source>
@@ -482,22 +483,22 @@
     </message>
     <message>
         <source>New Profile</source>
-        <translation>Nouveau Profile</translation>
+        <translation>Nouveau Profil</translation>
     </message>
     <message>
         <source>Save Profile</source>
-        <translation>Enregister Profile</translation>
+        <translation>Enregister Profil</translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
-        <translation>Modem attaché à :</translation>
+        <translation>Modem attaché à : </translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
-        <translation>Entrer le numéro de téléphone ici :</translation>
+        <translation>Numéro de téléphone : </translation>
     </message>
     <message>
         <source>AT commands</source>
@@ -505,7 +506,7 @@
     </message>
     <message>
         <source>Enter number</source>
-        <translation>Enter le numéro</translation>
+        <translation>Editer</translation>
     </message>
 </context>
 <context>
@@ -523,19 +524,19 @@
     </message>
     <message>
         <source>Terminal</source>
-        <translation>Terminale</translation>
+        <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
-        <translation>Connexion auto. après chargement</translation>
+        <translation>Connexion auto. au démarrage</translation>
     </message>
     <message>
         <source>Local Console</source>
-        <translation>Console locale</translation>
+        <translation>Console Locale</translation>
     </message>
     <message>
         <source>New Profile</source>
-        <translation>Nouveau Profile</translation>
+        <translation>Nouveau Profil</translation>
     </message>
 </context>
 <context>
@@ -674,11 +675,11 @@
     </message>
     <message>
         <source>Profile name</source>
-        <translation>Nom de profile</translation>
+        <translation>Nom de profil</translation>
     </message>
     <message>
         <source>Profile</source>
-        <translation>Profile</translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <source>Connection</source>
@@ -686,7 +687,7 @@
     </message>
     <message>
         <source>Terminal</source>
-        <translation>Terminale</translation>
+        <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
@@ -694,11 +695,11 @@
     </message>
     <message>
         <source>Invalid profile</source>
-        <translation>Profile invalide</translation>
+        <translation>Profil invalide</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
-        <translation>Veuillez entrer un nom de profile.</translation>
+        <translation>Veuillez entrer un nom de profil.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
@@ -726,7 +727,7 @@
     </message>
     <message>
         <source>Default Terminal</source>
-        <translation>Terminale par défaut</translation>
+        <translation>Terminal par défaut</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
@@ -796,11 +797,11 @@
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
-        <translation>Type de Terminale</translation>
+        <translation>Type de Terminal</translation>
     </message>
     <message>
         <source>Color scheme</source>
-        <translation>Combinaison de couleur</translation>
+        <translation>Combinaison couleurs</translation>
     </message>
     <message>
         <source>Font size</source>
@@ -820,7 +821,7 @@
     </message>
     <message>
         <source>Line-break conversions</source>
-        <translation>Conversions des retours chariots</translation>
+        <translation>Conversions retours chariots</translation>
     </message>
     <message>
         <source>Inbound</source>
@@ -856,7 +857,7 @@
     </message>
     <message>
         <source>X-Terminal</source>
-        <translation>X-Terminale</translation>
+        <translation>X-Terminal</translation>
     </message>
     <message>
         <source>black on white</source>
diff --git a/i18n/fr/opie-write.ts b/i18n/fr/opie-write.ts
index 6df0ac8..007d283 100644
--- a/i18n/fr/opie-write.ts
+++ b/i18n/fr/opie-write.ts
@@ -59,15 +59,15 @@
     </message>
     <message>
         <source>Left</source>
-        <translation>Gauche</translation>
+        <translation>A gauche</translation>
     </message>
     <message>
         <source>Center</source>
-        <translation>Centre</translation>
+        <translation>Centré</translation>
     </message>
     <message>
         <source>Right</source>
-        <translation>Droite</translation>
+        <translation>A droite</translation>
     </message>
     <message>
         <source>Full</source>
@@ -75,7 +75,7 @@
     </message>
     <message>
         <source>Rich Text Editor</source>
-        <translation>Rich Text Editor</translation>
+        <translation>Opie Write</translation>
     </message>
     <message>
         <source>Unnamed</source>
diff --git a/i18n/fr/opieftp.ts b/i18n/fr/opieftp.ts
index 9d41498..03a37e7 100644
--- a/i18n/fr/opieftp.ts
+++ b/i18n/fr/opieftp.ts
@@ -4,7 +4,7 @@
     <name>OpieFtp</name>
     <message>
         <source>OpieFtp</source>
-        <translation>OpieFtp</translation>
+        <translation>Opie FTP</translation>
     </message>
     <message>
         <source>Connection</source>
@@ -12,31 +12,31 @@
     </message>
     <message>
         <source>Local</source>
-        <translation>Local</translation>
+        <translation>Locale</translation>
     </message>
     <message>
         <source>Remote</source>
-        <translation>Distant</translation>
+        <translation>Distante</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Vue</translation>
+        <translation>Action</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Nouveau</translation>
+        <translation>Nouvelle</translation>
     </message>
     <message>
         <source>Connect</source>
-        <translation>Se connecter</translation>
+        <translation>Se Connecter</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation>Se déconnecter</translation>
+        <translation>Se Déconnecter</translation>
     </message>
     <message>
         <source>Show Hidden Files</source>
-        <translation>Montrer Fichiers Cachés</translation>
+        <translation>Voir Fichiers Cachés</translation>
     </message>
     <message>
         <source>Upload</source>
@@ -52,7 +52,7 @@
     </message>
     <message>
         <source>Delete</source>
-        <translation>Effacer</translation>
+        <translation>Supprimer</translation>
     </message>
     <message>
         <source>Download</source>
@@ -60,15 +60,15 @@
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Basculer sur Local</translation>
+        <translation>Onglet Connexion Locale</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Basculer sur Distant</translation>
+        <translation>Onglet Connexion Distante</translation>
     </message>
     <message>
         <source>Switch to Config</source>
-        <translation>Basculer sur la Config</translation>
+        <translation>Onglet Configuration</translation>
     </message>
     <message>
         <source>File</source>
@@ -100,7 +100,7 @@
     </message>
     <message>
         <source>Remote path</source>
-        <translation>Chemin distant</translation>
+        <translation>Répertoire distant</translation>
     </message>
     <message>
         <source>Port</source>
@@ -116,7 +116,8 @@
     </message>
     <message>
         <source>Please set the server info</source>
-        <translation>Veuillez définir les paramêtres du serveur distant</translation>
+        <translation>Veuillez définir les paramêtres
+du serveur distant</translation>
     </message>
     <message>
         <source>Ok</source>
@@ -135,7 +136,7 @@
     <message>
         <source>Unable to log in
 </source>
-        <translation>Impossible de se &quot;loguer&quot; à 
+        <translation>Impossible de se loguer à 
 </translation>
     </message>
     <message>
@@ -203,7 +204,8 @@ Il doit être vide</translation>
     <message>
         <source>Unable to make directory
 </source>
-        <translation>Impossible de créer un répertoire</translation>
+        <translation>Impossible de créer le répertoire
+</translation>
     </message>
     <message>
         <source>Unable to remove directory
@@ -245,7 +247,11 @@ Il doit être vide</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
-        <translation>Désolé, nom déjà utilisé</translation>
+        <translation>Ce nom est déjà utilisé</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Ajouter</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/opieirc.ts b/i18n/fr/opieirc.ts
index 88d0c26..938c6f2 100644
--- a/i18n/fr/opieirc.ts
+++ b/i18n/fr/opieirc.ts
@@ -50,7 +50,7 @@
     </message>
     <message>
         <source>Socket error : </source>
-        <translation>Erreur de socket :</translation>
+        <translation>Erreur de socket : </translation>
     </message>
     <message>
         <source>Connection closed</source>
@@ -61,15 +61,15 @@
     <name>IRCMessageParser</name>
     <message>
         <source>Received unhandled numeric command : </source>
-        <translation type="obsolete">Commande numérique reçu non supporté :</translation>
+        <translation type="obsolete">Commande numérique reçu non supporté : </translation>
     </message>
     <message>
         <source>Received unhandled ctcp command : </source>
-        <translation type="obsolete">Commande ctcp reçu non supporté :</translation>
+        <translation type="obsolete">Commande ctcp reçu non supporté : </translation>
     </message>
     <message>
         <source>Received unhandled literal command : </source>
-        <translation type="obsolete">Commande littérale reçu non supporté :</translation>
+        <translation type="obsolete">Commande littérale reçu non supporté : </translation>
     </message>
     <message>
         <source>Nonexistant channel join - desynchronized?</source>
@@ -283,7 +283,7 @@
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
-        <translation>Nom profile :</translation>
+        <translation>Nom profile : </translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
@@ -291,7 +291,7 @@
     </message>
     <message>
         <source>Hostname :</source>
-        <translation>Nom d&apos;hôte :</translation>
+        <translation>Nom d&apos;hôte : </translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
@@ -299,7 +299,7 @@
     </message>
     <message>
         <source>Port :</source>
-        <translation>Port :</translation>
+        <translation>Port : </translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
@@ -307,7 +307,7 @@
     </message>
     <message>
         <source>Nickname :</source>
-        <translation>Surnom :</translation>
+        <translation>Surnom : </translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
@@ -315,7 +315,7 @@
     </message>
     <message>
         <source>Realname :</source>
-        <translation>Nom Réel :</translation>
+        <translation>Nom Réel : </translation>
     </message>
     <message>
         <source>Your real name</source>
@@ -323,7 +323,7 @@
     </message>
     <message>
         <source>Password :</source>
-        <translation>Mot de passe :</translation>
+        <translation>Mot de passe : </translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
@@ -331,7 +331,7 @@
     </message>
     <message>
         <source>Channels :</source>
-        <translation>Canaux :</translation>
+        <translation>Canaux : </translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
@@ -432,7 +432,7 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
-        <translation>Lignes affichées :</translation>
+        <translation>Lignes affichées : </translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
@@ -444,7 +444,7 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     </message>
     <message>
         <source>Background color :</source>
-        <translation>Couleur d&apos;arrière plan :</translation>
+        <translation>Couleur d&apos;arrière plan : </translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
@@ -452,7 +452,7 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     </message>
     <message>
         <source>Normal text color :</source>
-        <translation>Couleur du texte simple :</translation>
+        <translation>Couleur du texte simple : </translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
@@ -460,7 +460,7 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     </message>
     <message>
         <source>Error color :</source>
-        <translation>Couleur d&apos;erreur :</translation>
+        <translation>Couleur d&apos;erreur : </translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
@@ -468,7 +468,7 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
-        <translation>Couleur de votre texte :</translation>
+        <translation>Couleur de votre texte : </translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
@@ -476,7 +476,7 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     </message>
     <message>
         <source>Text written by others :</source>
-        <translation>Couleur du texte des autres :</translation>
+        <translation>Couleur du texte des autres : </translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
@@ -484,7 +484,7 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     </message>
     <message>
         <source>Text written by the server :</source>
-        <translation>Couleur du texte du serveur :</translation>
+        <translation>Couleur du texte du serveur : </translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
@@ -492,7 +492,7 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     </message>
     <message>
         <source>Notifications :</source>
-        <translation>Notifications :</translation>
+        <translation>Notifications : </translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
diff --git a/i18n/fr/opieplayer.ts b/i18n/fr/opieplayer.ts
index 64320b9..f8fe968 100644
--- a/i18n/fr/opieplayer.ts
+++ b/i18n/fr/opieplayer.ts
@@ -55,7 +55,7 @@ Fermeture du lecteur en cours.</translation>
     </message>
     <message>
         <source>Sorry, no appropriate decoders found for this file: &lt;i&gt;</source>
-        <translation>Désolé, impossible de trouvé un décodeur approprié pour ce fichier: &lt;i&gt;</translation>
+        <translation>Désolé, impossible de trouvé un décodeur approprié pour ce fichier : &lt;i&gt;</translation>
     </message>
     <message>
         <source>Error opening file</source>
@@ -63,15 +63,15 @@ Fermeture du lecteur en cours.</translation>
     </message>
     <message>
         <source>Sorry, an error occured trying to play the file: &lt;i&gt;</source>
-        <translation>Une erreur est survenue lors l&apos;essai de la lecture du fichier: &lt;i&gt;</translation>
+        <translation>Une erreur est survenue lors de l&apos;essai de lecture du fichier : &lt;i&gt;</translation>
     </message>
     <message>
         <source> File: </source>
-        <translation>Fichier :</translation>
+        <translation>Fichier : </translation>
     </message>
     <message>
         <source>, Length: </source>
-        <translation>, Durée:</translation>
+        <translation>, Durée :</translation>
     </message>
     <message>
         <source>Volume</source>
@@ -201,7 +201,7 @@ Fermeture du lecteur en cours.</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
-        <translation>OpiePlayer :</translation>
+        <translation>OpiePlayer : </translation>
     </message>
     <message>
         <source>Out of space</source>
diff --git a/i18n/fr/opierec.ts b/i18n/fr/opierec.ts
index 3575ac1..ceb93e3 100644
--- a/i18n/fr/opierec.ts
+++ b/i18n/fr/opierec.ts
@@ -170,7 +170,7 @@ des fichiers sélectionnés ?</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
-        <translation>Ir Emission</translation>
+        <translation>Emission Ir</translation>
     </message>
     <message>
         <source>Ir sent.</source>
diff --git a/i18n/fr/osearch.ts b/i18n/fr/osearch.ts
index fef9e46..fb7d788 100644
--- a/i18n/fr/osearch.ts
+++ b/i18n/fr/osearch.ts
@@ -4,7 +4,7 @@
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
-        <translation>OSearch</translation>
+        <translation>Recherche</translation>
     </message>
     <message>
         <source>The details of the current result</source>
@@ -24,11 +24,11 @@
     </message>
     <message>
         <source>Calendar</source>
-        <translation>Calendrier</translation>
+        <translation>Agenda</translation>
     </message>
     <message>
         <source>Contacts</source>
-        <translation>Répertoire</translation>
+        <translation>Contact</translation>
     </message>
     <message>
         <source>Search</source>
@@ -40,7 +40,7 @@
     </message>
     <message>
         <source>Search all</source>
-        <translation>Rechecher tous</translation>
+        <translation>Rechercher tous</translation>
     </message>
     <message>
         <source>Options</source>
@@ -70,15 +70,15 @@
     <name>QObject</name>
     <message>
         <source>show completed tasks</source>
-        <translation>Montrer les tâches terminées</translation>
+        <translation>montrer les tâches terminées</translation>
     </message>
     <message>
         <source>show past events</source>
-        <translation>Montrer les évènements passés</translation>
+        <translation>montrer évènements passés</translation>
     </message>
     <message>
         <source>search in dates</source>
-        <translation>Recherche dates</translation>
+        <translation>rechercher dates</translation>
     </message>
     <message>
         <source>show</source>
@@ -90,35 +90,35 @@
     </message>
     <message>
         <source>execute</source>
-        <translation>Executer</translation>
+        <translation>lancer</translation>
     </message>
     <message>
         <source>open in filemanager</source>
-        <translation>Ouvrir dans le gestionnaire de fichiers</translation>
+        <translation>ouvrir dans le gestionnaire de fichiers</translation>
     </message>
     <message>
         <source>File: </source>
-        <translation>Fichier:</translation>
+        <translation>Fichier :</translation>
     </message>
     <message>
         <source>Link: </source>
-        <translation>Lien:</translation>
+        <translation>Lien : </translation>
     </message>
     <message>
         <source>Mimetype: </source>
-        <translation>type MIME:</translation>
+        <translation>Type MIME : </translation>
     </message>
     <message>
         <source>open with </source>
-        <translation>Ouvrir avec</translation>
+        <translation>ouvrir avec </translation>
     </message>
     <message>
         <source>search content</source>
-        <translation>Rechercher contenu</translation>
+        <translation>rechercher contenu</translation>
     </message>
     <message>
         <source>searching %1</source>
-        <translation>recherche de %1 en cours</translation>
+        <translation>recherche de %1</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/oxygen.ts b/i18n/fr/oxygen.ts
index 94d4a97..b726699 100644
--- a/i18n/fr/oxygen.ts
+++ b/i18n/fr/oxygen.ts
@@ -28,14 +28,14 @@
     </message>
     <message>
         <source>Elemental Composition (%):</source>
-        <translation>Composition Elementaire (%) :</translation>
+        <translation>Composition Elementaire (%) : </translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
         <source>Weight:</source>
-        <translation type="obsolete">Masse :</translation>
+        <translation type="obsolete">Masse : </translation>
     </message>
     <message>
         <source>Block</source>
diff --git a/i18n/fr/qasteroids.ts b/i18n/fr/qasteroids.ts
index b024b6f..b8caf86 100644
--- a/i18n/fr/qasteroids.ts
+++ b/i18n/fr/qasteroids.ts
@@ -4,7 +4,7 @@
     <name>KAstTopLevel</name>
     <message>
         <source>Asteroids</source>
-        <translation>Astéro��des</translation>
+        <translation>Astéro��des</translation>
     </message>
     <message>
         <source>Score</source>
@@ -24,7 +24,8 @@
     </message>
     <message>
         <source>Press Calendar to start playing</source>
-        <translation>Pressez le boutton &quot;Calendrier&quot; pour démarrer le jeu</translation>
+        <translation>Pressez le bouton &quot;Agenda&quot; pour
+démarrer une nouvelle partie</translation>
     </message>
     <message>
         <source>Ship Destroyed.
@@ -36,7 +37,8 @@ Pressez le boutton &quot;Contacts&quot;.</translation>
         <source>Game Over.
 Press Calendar for a new game.</source>
         <translation>Fin de partie.
-Pressez le boutton &quot;Calendrier&quot; pour démarrer un nouveau jeu.</translation>
+Pressez le boutton &quot;Agenda&quot; pour
+démarrer un nouveau jeu.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/qpe.ts b/i18n/fr/qpe.ts
index 5815647..18d1841 100644
--- a/i18n/fr/qpe.ts
+++ b/i18n/fr/qpe.ts
@@ -1,18 +1,80 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation>Langue</translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation>Heure et Date</translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation>Information Personnelle</translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation>Problème Application</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;%1 ne répond pas.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Voulez-vous forcer l&apos;application à quitter ?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;&lt;p&gt;Le chargement rapide a été désactivé pour cette application. Cliquez et maintenez la pression sur l&apos;icône pour la réactiver.&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; a été terminée par le signal %2&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation>Application terminée</translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation>Application non trouvée</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Impossible de trouver l&apos;application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erreur</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Impossible de trouver l&apos;application %1&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>Problème de l&apos;application</translation>
+        <translation type="obsolete">Problème de l&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1&gt; ne répond pas.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;%1 ne répond pas.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Voulez-vous forcer l&apos;pplication à quitter?&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Voulez-vous forcer l&apos;application à quitter?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -20,27 +82,27 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>Cliquez sur la croix fermement et
+        <translation type="obsolete">Cliquez sur la croix fermement et
 avec précision pour calibrer l&apos;écran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Bienvenue sur Opie</translation>
+        <translation type="obsolete">Bienvenue sur Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>Documents</translation>
+        <translation type="obsolete">Documents</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>Vue icon</translation>
+        <translation type="obsolete">Vue Icône</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>Vue liste</translation>
+        <translation type="obsolete">Vue Liste</translation>
     </message>
 </context>
 <context>
@@ -48,31 +110,31 @@ avec précision pour calibrer l&apos;écran.</translation>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>Le niveau de batterie est critique !
+        <translation type="obsolete">Le niveau de batterie est critique !
 Eteigner la machine jusqu&apos;à ça recharge !</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation>Le niveau de batterie est très bas.</translation>
+        <translation type="obsolete">Le niveau de batterie est très bas.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>La niveau de la batterie de sauvegarde est très bas.
+        <translation type="obsolete">La niveau de la batterie de sauvegarde est très bas.
 Veuillez rechargez la batterie de sauvegarde.</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>business card</translation>
+        <translation type="obsolete">business card</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>Information</translation>
+        <translation type="obsolete">Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;La date système ne semble pas être valide.
+        <translation type="obsolete">&lt;p&gt;La date système ne semble pas être valide.
 (%1)&lt;/p&gt;&lt;p&gt; Voulez-vous la corriger ?&lt;/p&gt;</translation>
     </message>
 </context>
@@ -80,7 +142,49 @@ Veuillez rechargez la batterie de sauvegarde.</translation>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
-        <translation type="obsolete">Status Batterie</translation>
+        <translation>Status Batterie</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation>Batterie Faible</translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation>&lt;&lt; Précédent</translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation>Suivant &gt;&gt;</translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation>Cliquez sur l&apos;écran pour continuer.</translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation>Chargement de la configuration de %1.</translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation>Veuillez patienter...</translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation>Premier Arriere Plan</translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation>Terminer</translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation>Unicode</translation>
     </message>
 </context>
 <context>
@@ -103,88 +207,205 @@ Veuillez rechargez la batterie de sauvegarde.</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation>Recherche de documents</translation>
+        <translation type="obsolete">Recherche de documents</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation>Recherche de documents</translation>
+        <translation type="obsolete">Recherche de documents</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation>Documents</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation>Aperçu en texte</translation>
+    </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation>&lt;b&gt;Recherche Documents...&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation>Vue Icône</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation>Vue Liste</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>%1 fichiers</translation>
+        <translation type="obsolete">Fichiers %1</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>Tous les types de fichiers</translation>
+        <translation type="obsolete">Tous les fichiers</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vue Document</translation>
     </message>
+    <message>
+        <source>All types</source>
+        <translation>Tous types</translation>
+    </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>Media inséré</translation>
+        <translation type="obsolete">Media inséré</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>Un &lt;b&gt;média de stockage&lt;/b&gt; a été inséré. Doit-il être parcouri à la recherche de fichiers?</translation>
+        <translation type="obsolete">Un &lt;b&gt;média de stockage&lt;/b&gt; a été inséré. Doit-il être parcouru à la recherche de fichiers?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Quels fichiers</translation>
+        <translation type="obsolete">Quels fichiers</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Audio</translation>
+        <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Image</translation>
+        <translation type="obsolete">Image</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Texte</translation>
+        <translation type="obsolete">Texte</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Vidéo</translation>
+        <translation type="obsolete">Vidéo</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Tous</translation>
+        <translation type="obsolete">Tous</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>Liés les apps</translation>
+        <translation type="obsolete">Lier apps</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>Limiter la recherche au répertoire: (pas encore utilisé)</translation>
+        <translation type="obsolete">Limiter la recherche au répertoire: (pas encore utilisé)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>Ajouter</translation>
+        <translation type="obsolete">Ajouter</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>Votre choix va être enregistré sur le média.</translation>
+        <translation type="obsolete">Votre choix va être enregistré sur le média.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>Ne plus demander pour ce média</translation>
+        <translation type="obsolete">Ne plus demander pour ce média</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation>Status Batterie</translation>
+        <translation type="obsolete">Status Batterie</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation>Mode Sans Echec</translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation>Gestionnaire Plugin...</translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation>Redémarrer Qtopia</translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation>Aide...</translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation>Information</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;La date système ne semble pas être valide.
+(%1)&lt;/p&gt;&lt;p&gt; Voulez-vous la corriger ?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation>Le niveau de batterie est critique !
+Eteigner la machine jusqu&apos;à ça recharge !</translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation>Battery très faible.</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation>La niveau de la batterie de sauvegarde est très bas.
+Veuillez rechargez la batterie de sauvegarde.</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation>carte de visite</translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation>Mode Sans Echec</translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation>&lt;P&gt;Une erreur s&apos;est produite lors du démarrage et le système est maintenant en mode sans échec. Les plugins ne sont pas démarrés en mode sans échec. Vous pouvez utiliser le Gestionnaire de Plugin pour désactiver le ou les plugins causant l&apos;erreur.</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation>Gestionnaire Plugin...</translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation>Status Mémoire</translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation>Ressource Mémoire faible
+Sauvegardez vos données.</translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation>Ressource Mémoire Critique
+Vous devriez fermer cette
+application immédiatement.</translation>
     </message>
 </context>
 <context>
@@ -213,7 +434,7 @@ Veuillez rechargez la batterie de sauvegarde.</translation>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
-Ces options sont fournies pour être utilisées durant le développement et les tests du système Opie. Dans les conditions normales d&apos;utilisation, ces concepts ne sont pas nécessaires.</translation>
+Ces options sont destinés à être utilisées durant le développement et les tests du système Opie. Dans les conditions normales d&apos;utilisation, ces concepts ne sont pas nécessaires.</translation>
     </message>
     <message>
         <source>Cancel</source>
@@ -251,15 +472,23 @@ Ces options sont fournies pour être utilisées durant le développement et les
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>Synchronisation en cours</translation>
+        <translation type="obsolete">Synchronisation en cours</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Contacts&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Contacts&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Annuler</translation>
+        <translation type="obsolete">&amp;Annuler</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abandonner</translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation>Synchronisé : </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/reader.ts b/i18n/fr/reader.ts
index f192339..04a0d47 100644
--- a/i18n/fr/reader.ts
+++ b/i18n/fr/reader.ts
@@ -119,7 +119,7 @@
     </message>
     <message>
         <source>Scroll Speed</source>
-        <translation>Vitesse de Défilement</translation>
+        <translation>Vitesse Défilement</translation>
     </message>
     <message>
         <source>Right Arrow</source>
@@ -202,7 +202,7 @@ Pression</translation>
     <message>
         <source>Apply font
 to dialogs</source>
-        <translation>Appliquer font
+        <translation>Appliquer fonte
 sur dialogues</translation>
     </message>
     <message>
@@ -430,15 +430,15 @@ Ligne</translation>
     </message>
     <message>
         <source>Depluck</source>
-        <translation>Déselecteur</translation>
+        <translation>Désélecteur</translation>
     </message>
     <message>
         <source>Dejpluck</source>
-        <translation>Dejpluck</translation>
+        <translation>Désélecteur</translation>
     </message>
     <message>
         <source>Continuous</source>
-        <translation>Permanent</translation>
+        <translation>Continu</translation>
     </message>
 </context>
 <context>
@@ -481,7 +481,8 @@ Ligne</translation>
     </message>
     <message>
         <source>Page/Line Scroll</source>
-        <translation>Défilement page/ligne</translation>
+        <translation>Défilement
+page/ligne</translation>
     </message>
 </context>
 <context>
@@ -554,7 +555,7 @@ Ligne</translation>
     </message>
     <message>
         <source>Ideogram</source>
-        <translation>Ideogram</translation>
+        <translation>Ideograme</translation>
     </message>
 </context>
 <context>
@@ -605,7 +606,8 @@ Ligne</translation>
     </message>
     <message>
         <source>Page/Line Scroll</source>
-        <translation>Défilement page/ligne</translation>
+        <translation>Défilement
+page/ligne</translation>
     </message>
     <message>
         <source>Set Overlap</source>
@@ -909,11 +911,11 @@ Ligne</translation>
     </message>
     <message>
         <source>Set Encoding</source>
-        <translation>Fixé Encodage</translation>
+        <translation>Fixer Encodage</translation>
     </message>
     <message>
         <source>Ideogram</source>
-        <translation>Ideogram</translation>
+        <translation>Ideogramme</translation>
     </message>
     <message>
         <source>Bookmark</source>
diff --git a/i18n/fr/security.ts b/i18n/fr/security.ts
index 243e79c..aa36bea 100644
--- a/i18n/fr/security.ts
+++ b/i18n/fr/security.ts
@@ -4,11 +4,13 @@
     <name>Security</name>
     <message>
         <source>Set passcode</source>
-        <translation>Fixer mot de passe</translation>
+        <translation>Entrer le
+mot de passe</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Changer mot de passe</translation>
+        <translation>Changer le
+mot de passe</translation>
     </message>
     <message>
         <source>Enter passcode</source>
@@ -49,11 +51,13 @@ Accès refusé</translation>
     </message>
     <message>
         <source>Change passcode</source>
-        <translation>Changer le mot de passe</translation>
+        <translation>Changer le
+mot de passe</translation>
     </message>
     <message>
         <source>Clear passcode</source>
-        <translation>Effacer le mot de passe</translation>
+        <translation>Effacer le
+mot de passe</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
@@ -65,7 +69,7 @@ Accès refusé</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
-        <translation>Accepter la synchronisation par réseau de :</translation>
+        <translation>Accepter la synchronisation par réseau de : </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
@@ -89,7 +93,7 @@ Accès refusé</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;Ce code secret permet un niveau de protection minimal pour l&apos;accès à votre organiseur.</translation>
+        <translation>&lt;P&gt;Ce mot de passe vous permet de protéger l&apos;accès à votre organiseur.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
diff --git a/i18n/fr/sheetqt.ts b/i18n/fr/sheetqt.ts
index bf30484..d4debb3 100644
--- a/i18n/fr/sheetqt.ts
+++ b/i18n/fr/sheetqt.ts
@@ -19,11 +19,11 @@
     </message>
     <message>
         <source>&amp;Width:</source>
-        <translation>&amp;Largeur :</translation>
+        <translation>&amp;Largeur : </translation>
     </message>
     <message>
         <source>&amp;Color:</source>
-        <translation>&amp;Couleur :</translation>
+        <translation>&amp;Couleur : </translation>
     </message>
     <message>
         <source>&amp;Default Borders</source>
@@ -31,7 +31,7 @@
     </message>
     <message>
         <source>&amp;Style:</source>
-        <translation>&amp;Style :</translation>
+        <translation>&amp;Style : </translation>
     </message>
     <message>
         <source>&amp;Default Background</source>
@@ -39,11 +39,11 @@
     </message>
     <message>
         <source>&amp;Font:</source>
-        <translation>&amp;Police :</translation>
+        <translation>&amp;Police : </translation>
     </message>
     <message>
         <source>&amp;Size:</source>
-        <translation>&amp;Taille :</translation>
+        <translation>&amp;Taille : </translation>
     </message>
     <message>
         <source>&amp;Bold</source>
@@ -59,11 +59,11 @@
     </message>
     <message>
         <source>&amp;Vertical:</source>
-        <translation>&amp;Verticale :</translation>
+        <translation>&amp;Verticale : </translation>
     </message>
     <message>
         <source>&amp;Horizontal:</source>
-        <translation>&amp;Horizontale :</translation>
+        <translation>&amp;Horizontale : </translation>
     </message>
     <message>
         <source>&amp;Word Wrap</source>
@@ -94,11 +94,11 @@
     </message>
     <message>
         <source>&amp;Search for:</source>
-        <translation>&amp;Rechercher :</translation>
+        <translation>&amp;Rechercher : </translation>
     </message>
     <message>
         <source>&amp;Replace with:</source>
-        <translation>Remplacer &amp;par :</translation>
+        <translation>Remplacer &amp;par : </translation>
     </message>
     <message>
         <source>&amp;Type</source>
@@ -169,7 +169,7 @@
     </message>
     <message>
         <source>&amp;File Name:</source>
-        <translation>Nom &amp;Fichier :</translation>
+        <translation>Nom &amp;Fichier : </translation>
     </message>
     <message>
         <source>UnnamedFile</source>
@@ -665,15 +665,15 @@ http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
-        <translation>&amp;Nombre de Lignes :</translation>
+        <translation>&amp;Nombre de Lignes : </translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
-        <translation>&amp;Nombre de colonnes :</translation>
+        <translation>&amp;Nombre de colonnes : </translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
-        <translation>&amp;Nombre de feuilles :</translation>
+        <translation>&amp;Nombre de feuilles : </translation>
     </message>
     <message>
         <source>Sheet</source>
@@ -681,15 +681,15 @@ http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
-        <translation>&amp;Hauteur de chaque ligne :</translation>
+        <translation>&amp;Hauteur de chaque ligne : </translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
-        <translation>&amp;Largeur de chaque colonne :</translation>
+        <translation>&amp;Largeur de chaque colonne : </translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
-        <translation>&amp;Nom de Feuille :</translation>
+        <translation>&amp;Nom de Feuille : </translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
diff --git a/i18n/fr/showimg.ts b/i18n/fr/showimg.ts
index 7d35896..bb7f9f5 100644
--- a/i18n/fr/showimg.ts
+++ b/i18n/fr/showimg.ts
@@ -22,7 +22,7 @@
     <name>ImageViewer</name>
     <message>
         <source>Image Viewer</source>
-        <translation>Visualiseur d&apos;Images</translation>
+        <translation>Diaporama</translation>
     </message>
     <message>
         <source>Horizontal flip</source>
@@ -50,15 +50,15 @@
     </message>
     <message>
         <source> - Image Viewer</source>
-        <translation>- Visualiseur d&apos;images</translation>
+        <translation> - Diaporama</translation>
     </message>
     <message>
         <source> True color</source>
-        <translation>Vrai couleur</translation>
+        <translation>16777216</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Aficchage</translation>
+        <translation>Affichage</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
@@ -110,7 +110,7 @@
     </message>
     <message>
         <source>8-bit alpha channel</source>
-        <translation>8-bit canal alpha</translation>
+        <translation>Canal alpha 8-bit </translation>
     </message>
     <message>
         <source>Slide show</source>
@@ -122,6 +122,33 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation>Nom Fichier</translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation>Format</translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation>Taille Fichier</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Taille</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation>Couleurs</translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation>Alpha</translation>
+    </message>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
@@ -137,7 +164,7 @@
     </message>
     <message>
         <source>s</source>
-        <translation>s</translation>
+        <translation> s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
diff --git a/i18n/fr/snake.ts b/i18n/fr/snake.ts
index 6642f7e..8d0e576 100644
--- a/i18n/fr/snake.ts
+++ b/i18n/fr/snake.ts
@@ -46,7 +46,8 @@ Votre score : %1</translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
-        <translation>Pressez une touche pour commencer une nouvelle partie.</translation>
+        <translation>Pressez une touche pour commencer
+une nouvelle partie.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/sound.ts b/i18n/fr/sound.ts
index 2943d2a..5316403 100644
--- a/i18n/fr/sound.ts
+++ b/i18n/fr/sound.ts
@@ -47,11 +47,12 @@
     </message>
     <message>
         <source>Visual Alerts</source>
-        <translation>Alertes visuelles</translation>
+        <translation>Alertes
+Visuelles</translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
-        <translation>Icone de la bare de la tâche</translation>
+        <translation>Icône de la barre de tâche</translation>
     </message>
     <message>
         <source>Key_Space</source>
@@ -99,19 +100,19 @@
     </message>
     <message>
         <source>Sample Rate:</source>
-        <translation>Taux d&apos;échantillonage :</translation>
+        <translation>Taux d&apos;échantillonage : </translation>
     </message>
     <message>
         <source>Recording Directory:</source>
-        <translation>Répertoire d&apos;enregistrement :</translation>
+        <translation>Répertoire d&apos;enregistrement : </translation>
     </message>
     <message>
         <source>Recording Key:</source>
-        <translation>Touche d&apos;enregistrement :</translation>
+        <translation>Touche d&apos;enregistrement : </translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
-        <translation>Temps d&apos;enreg. max en secondes :</translation>
+        <translation>Temps d&apos;enreg. max en secondes : </translation>
     </message>
     <message>
         <source>Unlimited</source>
diff --git a/i18n/fr/sysinfo.ts b/i18n/fr/sysinfo.ts
index 9eca32f..65c98b4 100644
--- a/i18n/fr/sysinfo.ts
+++ b/i18n/fr/sysinfo.ts
@@ -51,15 +51,17 @@
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Utilisation du processeur par les applications (%)</translation>
+        <translation>Utilisation du processeur par
+les applications (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>Utilisation du processeur par le système (%)</translation>
+        <translation>Utilisation du processeur par
+le système (%)</translation>
     </message>
     <message>
         <source>Type: </source>
-        <translation>Type :</translation>
+        <translation>Type : </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
@@ -86,7 +88,7 @@
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
-        <translation>Mémoire Totale: %1 ko</translation>
+        <translation>Mémoire Totale : %1 Ko</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
@@ -97,7 +99,7 @@ Memory is categorized as follows:
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation>Cette page montre l&apos;utilisation de la mémoire par votre PDA.
-La mémoire est divisée en catégories comme suit:
+La mémoire est divisée en catégories comme suit :
 
 1. Utilisée - Mémoire utilisée par Opie et toutes autres applications en cours d&apos;exécution.
 2. Buffers - Mémoire temporaire utilisée pour accroître les performances
@@ -341,31 +343,31 @@ Cliquez et maintenez appuyer pour voir les informations à propos du processus o
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation>&lt;b&gt;Noyau Linux&lt;/b&gt;&lt;p&gt;Version :</translation>
+        <translation>&lt;b&gt;Noyau Linux&lt;/b&gt;&lt;p&gt;Version : </translation>
     </message>
     <message>
         <source>Compiled by: </source>
-        <translation>Compilé par :</translation>
+        <translation>Compilé par : </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version :</translation>
+        <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version : </translation>
     </message>
     <message>
         <source>Built on: </source>
-        <translation>Construit le :</translation>
+        <translation>Construit le : </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
-        <translation>&lt;p&gt;Version :</translation>
+        <translation>&lt;p&gt;Version : </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Modèle :</translation>
+        <translation>&lt;p&gt;Modèle : </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;Fabricant :</translation>
+        <translation>&lt;p&gt;Fabricant : </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
diff --git a/i18n/fr/systemtime.ts b/i18n/fr/systemtime.ts
index 21f7354..8f96cdd 100644
--- a/i18n/fr/systemtime.ts
+++ b/i18n/fr/systemtime.ts
@@ -82,7 +82,7 @@
     </message>
     <message>
         <source>Continue?</source>
-        <translation>Continuer?</translation>
+        <translation>Continuer ?</translation>
     </message>
     <message>
         <source>Running:
@@ -387,7 +387,8 @@ ntpdate</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation>secondes</translation>
+        <translation>Afficher les infos de prédiction
+de l&apos;heure</translation>
     </message>
 </context>
 <context>
@@ -476,19 +477,23 @@ ntpdate</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
-        <translation>minutes entre 2 synchronisation de l&apos;heure</translation>
+        <translation>minutes entre 2 synchronisations
+de l&apos;heure</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
-        <translation>minutes entre 2 mise à jour de prévision</translation>
+        <translation>minutes entre 2 mise-à-jour
+de prévision</translation>
     </message>
     <message>
         <source>Display time server information</source>
-        <translation>Afficher les informations sur le serveur NTP</translation>
+        <translation>Afficher les informations sur
+le serveur NTP</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
-        <translation>Afficher les infos de prediction de l&apos;heure</translation>
+        <translation>Afficher les infos de prédiction
+de l&apos;heure</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/fr/tabmanager.ts b/i18n/fr/tabmanager.ts
index f0b3fc6..1a52362 100644
--- a/i18n/fr/tabmanager.ts
+++ b/i18n/fr/tabmanager.ts
@@ -8,19 +8,19 @@
     </message>
     <message>
         <source>Name:</source>
-        <translation>Nom :</translation>
+        <translation>Nom : </translation>
     </message>
     <message>
         <source>Icon:</source>
-        <translation>Icône :</translation>
+        <translation>Icône : </translation>
     </message>
     <message>
         <source>Exec:</source>
-        <translation>Exec :</translation>
+        <translation>Exec : </translation>
     </message>
     <message>
         <source>Comment:</source>
-        <translation>Commentaire :</translation>
+        <translation>Commentaire : </translation>
     </message>
 </context>
 <context>
diff --git a/i18n/fr/textedit.ts b/i18n/fr/textedit.ts
index 1988293..6ff4733 100644
--- a/i18n/fr/textedit.ts
+++ b/i18n/fr/textedit.ts
@@ -116,7 +116,7 @@
     </message>
     <message>
         <source>File Permissions</source>
-        <translation>Droits du Fichier</translation>
+        <translation>Permissions du Fichier</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
@@ -148,7 +148,7 @@
     </message>
     <message>
         <source>Permissions</source>
-        <translation>Droits</translation>
+        <translation>Permissions</translation>
     </message>
     <message>
         <source>Choose font</source>
@@ -203,19 +203,18 @@ Continuer et sauvegarder ?</translation>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
-        <translation>Confirmez-vous la &lt;BR&gt;&lt;B&gt;suppression&lt;/B&gt; du fichier courant ?
-&lt;B&gt;Cette suppression est irréversible !&lt;/B&gt;</translation>
+        <translation>Confirmez-vous la &lt;B&gt;suppression&lt;/B&gt; du fichier courant ?&lt;BR&gt;&lt;B&gt;Cette suppression est irréversible !&lt;/B&gt;</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
-        <translation>Fixer les Droits du Fichier</translation>
+        <translation>Fixer les Permissions du Fichier</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
-        <translation>Fixer les droits du fichier pour :</translation>
+        <translation>Fixer les Permissions du fichier pour : </translation>
     </message>
     <message>
         <source>owner</source>
@@ -255,11 +254,11 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
     </message>
     <message>
         <source>Error- no user</source>
-        <translation>Erreur- pas d&apos;utilisateur</translation>
+        <translation>Erreur - pas d&apos;utilisateur</translation>
     </message>
     <message>
         <source>Error- no  group</source>
-        <translation>Erreur- pas de groupe</translation>
+        <translation>Erreur - pas de groupe</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
@@ -267,11 +266,11 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
     </message>
     <message>
         <source>Error setting mode</source>
-        <translation>Erreur lors de la défintion du mode</translation>
+        <translation>Erreur lors de la définition du mode</translation>
     </message>
     <message>
         <source>File Permissions</source>
-        <translation>Droits du Fichier</translation>
+        <translation>Permissions du Fichier</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/tictac.ts b/i18n/fr/tictac.ts
index 6c3d04a..9dd9c4c 100644
--- a/i18n/fr/tictac.ts
+++ b/i18n/fr/tictac.ts
@@ -19,7 +19,7 @@
     </message>
     <message>
         <source>Play!</source>
-        <translation>Joué !</translation>
+        <translation>Jouer !</translation>
     </message>
     <message>
         <source>Quit</source>
@@ -27,7 +27,7 @@
     </message>
     <message>
         <source>Click Play to start</source>
-        <translation>Cliquez sur Joué pour démarrer</translation>
+        <translation>Cliquez sur Jouer pour démarrer</translation>
     </message>
     <message>
         <source>Make your move</source>
diff --git a/i18n/fr/tinykate.ts b/i18n/fr/tinykate.ts
index 2b56dc9..5815371 100644
--- a/i18n/fr/tinykate.ts
+++ b/i18n/fr/tinykate.ts
@@ -16,11 +16,11 @@
     </message>
     <message>
         <source>Save</source>
-        <translation>Sauver</translation>
+        <translation>Enregistrer</translation>
     </message>
     <message>
         <source>Save As</source>
-        <translation>Sauver sous</translation>
+        <translation>Enregistrer sous</translation>
     </message>
     <message>
         <source>Close</source>
@@ -32,15 +32,15 @@
     </message>
     <message>
         <source>Font +</source>
-        <translation>Font +</translation>
+        <translation>Zoom avant</translation>
     </message>
     <message>
         <source>Font -</source>
-        <translation>Font -</translation>
+        <translation>Zoom arrière</translation>
     </message>
     <message>
         <source>View</source>
-        <translation>Vue</translation>
+        <translation>Affichage</translation>
     </message>
     <message>
         <source>Utils</source>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index 35ee222..bf27afc 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -12,7 +12,7 @@
     </message>
     <message>
         <source>Please fill out the business card</source>
-        <translation>Remplissez vos param��tres personnels</translation>
+        <translation>Entrez vos donn��es personnels</translation>
     </message>
     <message>
         <source>No plugins found</source>
@@ -39,7 +39,7 @@
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
-        <translation>Cliquer ici pour accéder à la fenêtre de configuration</translation>
+        <translation>Cliquez ici pour accéder à la fenêtre de configuration</translation>
     </message>
 </context>
 <context>
@@ -50,7 +50,7 @@
     </message>
     <message>
         <source>Load which plugins in what order:</source>
-        <translation>Chargement et ordre des modules :</translation>
+        <translation>Ordre chargement modules : </translation>
     </message>
     <message>
         <source>Move Up</source>
@@ -149,7 +149,7 @@ resume?
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation>Après combien de minutes de  veille du PDA la fonction &quot;Démarrage auto&quot; doit-elle être activée</translation>
+        <translation>Après combien de minutes de veille du PDA la fonction &quot;Démarrage auto&quot; doit-elle être activée</translation>
     </message>
     <message>
         <source>minutes inactive</source>
@@ -177,7 +177,7 @@ resume?
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation>Périodicité des rafraîchissements de &quot;Aujourd&apos;hui&quot;</translation>
+        <translation>Périodicité de rafraîchissement de &quot;Aujourd&apos;hui&quot;</translation>
     </message>
     <message>
         <source>refresh</source>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 2b2ae7a..98923e8 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -39,7 +39,7 @@
     </message>
     <message>
         <source>Task Editor</source>
-        <translation>Task Editor</translation>
+        <translation>Editeur de Tâches</translation>
     </message>
 </context>
 <context>
@@ -58,7 +58,7 @@
     </message>
     <message>
         <source>silent</source>
-        <translation>Silencieuse</translation>
+        <translation>Muette</translation>
     </message>
     <message>
         <source>loud</source>
@@ -105,7 +105,7 @@
     </message>
     <message>
         <source>Delete completed</source>
-        <translation>Suppression Terminé</translation>
+        <translation>Supprimer Tâches Terminées</translation>
     </message>
     <message>
         <source>Beam</source>
@@ -137,7 +137,7 @@
     </message>
     <message>
         <source>Data</source>
-        <translation>Donn��e</translation>
+        <translation>T��ches</translation>
     </message>
     <message>
         <source>Category</source>
@@ -181,12 +181,12 @@ Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation>&quot;Tâche&quot; n&apos;a pas pu
-enregistrer vos changements.
-Libérez de l&apos;espace
-et réessayez.
+        <translation>L&apos;application n&apos;a pas pu
+enregistrer vos modifications.
+Libérez de l&apos;espace et
+réessayez.
 
-Quitter?</translation>
+Voulez-vous quitter ?</translation>
     </message>
     <message>
         <source>Todo</source>
@@ -198,11 +198,11 @@ Quitter?</translation>
     </message>
     <message>
         <source>all tasks?</source>
-        <translation>toutes les tâches ?</translation>
+        <translation> toutes les tâches ?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
-        <translation>toutes les tâches effectuées ?</translation>
+        <translation> toutes les tâches effectuées ?</translation>
     </message>
     <message>
         <source>Unfiled</source>
@@ -242,7 +242,7 @@ Quitter?</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation>Priorité :</translation>
+        <translation>Priorité : </translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
@@ -395,7 +395,7 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
-        <translation>Description :</translation>
+        <translation>Description : </translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
@@ -467,7 +467,7 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
     </message>
     <message>
         <source>Category:</source>
-        <translation>Catégorie :</translation>
+        <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
@@ -479,11 +479,11 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
-        <translation>Cliquer ici si cette tâches doit-être répétée. La fréquence est choisie dans le tableau de Répétition.</translation>
+        <translation>Cliquez ici si cette tâches doit-être répétée. La fréquence est choisie dans l&apos;onglet de Répétition.</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation type="obsolete">Notes :</translation>
+        <translation type="obsolete">Notes : </translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
@@ -495,14 +495,14 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
     </message>
     <message>
         <source>Summary:</source>
-        <translation>Résumé :</translation>
+        <translation>Résumé : </translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
-        <translation>Etat :</translation>
+        <translation>Etat : </translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
@@ -510,27 +510,27 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
     </message>
     <message>
         <source>Started</source>
-        <translation>Démarrée</translation>
+        <translation>Démarré</translation>
     </message>
     <message>
         <source>Postponed</source>
-        <translation>Reportée</translation>
+        <translation>Reporté</translation>
     </message>
     <message>
         <source>Finished</source>
-        <translation>Terminée</translation>
+        <translation>Terminé</translation>
     </message>
     <message>
         <source>Not started</source>
-        <translation>Arrétée</translation>
+        <translation>Non Démarré</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation>Avancement :</translation>
+        <translation>Avancement : </translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
-        <translation>Selectionnez l&apos;avancement de la tâche ici.</translation>
+        <translation>Sélectionnez l&apos;avancement de la tâche ici.</translation>
     </message>
     <message>
         <source>0 %</source>
@@ -558,7 +558,7 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
     </message>
     <message>
         <source>Start Date:</source>
-        <translation>Date de début :</translation>
+        <translation>Date de début : </translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
@@ -566,7 +566,7 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
     </message>
     <message>
         <source>Due Date:</source>
-        <translation>Date d&apos;écheance :</translation>
+        <translation>Date d&apos;écheance : </translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
@@ -574,7 +574,7 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
     </message>
     <message>
         <source>Completed:</source>
-        <translation>Terminée :</translation>
+        <translation>Terminée : </translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
@@ -586,7 +586,7 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
     </message>
     <message>
         <source>Maintainer Mode:</source>
-        <translation>Mode Maintenance :</translation>
+        <translation>Mode Maintenance : </translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
@@ -610,7 +610,7 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
     </message>
     <message>
         <source>Maintainer:</source>
-        <translation>Mainteneur :</translation>
+        <translation>Mainteneur : </translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
diff --git a/i18n/fr/wordgame.ts b/i18n/fr/wordgame.ts
index c3cb707..dddc4d3 100644
--- a/i18n/fr/wordgame.ts
+++ b/i18n/fr/wordgame.ts
@@ -4,7 +4,7 @@
     <name>Board</name>
     <message>
         <source>Blanks: </source>
-        <translation>Vides :</translation>
+        <translation>Vides : </translation>
     </message>
     <message>
         <source>OK</source>
@@ -39,7 +39,7 @@
     </message>
     <message>
         <source>AI3: Smart AI player</source>
-        <translation>AI3: Smart Al player</translation>
+        <translation>Machine</translation>
     </message>
     <message>
         <source>Rules</source>
@@ -58,7 +58,7 @@
     </message>
     <message>
         <source>Name:</source>
-        <translation>Name :</translation>
+        <translation>Nom : </translation>
     </message>
     <message>
         <source>Board</source>
@@ -66,7 +66,7 @@
     </message>
     <message>
         <source>Size:</source>
-        <translation>Taille :</translation>
+        <translation>Taille : </translation>
     </message>
     <message>
         <source>Edit...</source>
@@ -78,7 +78,7 @@
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
@@ -89,11 +89,11 @@
     <name>ScoreInfo</name>
     <message>
         <source>&lt;P&gt;Invalid move</source>
-        <translation>&lt;P&gt;Movement non valide</translation>
+        <translation>&lt;P&gt;Mouvement non valide</translation>
     </message>
     <message>
         <source>&lt;P&gt;Score: </source>
-        <translation>&lt;P&gt;Score :</translation>
+        <translation>&lt;P&gt;Score : </translation>
     </message>
 </context>
 <context>
@@ -120,7 +120,7 @@
     </message>
     <message>
         <source>Do you want to end the game early?</source>
-        <translation>Voulez-vous mettre fin au jeu prématurément ?</translation>
+        <translation>Voulez-vous mettre fin au jeu ?</translation>
     </message>
     <message>
         <source>Yes</source>
diff --git a/i18n/hu/advancedfm.ts b/i18n/hu/advancedfm.ts
index ed7af0f..8a9ac63 100644
--- a/i18n/hu/advancedfm.ts
+++ b/i18n/hu/advancedfm.ts
@@ -38,14 +38,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -255,6 +247,26 @@ and all it&apos;s contents ?</source>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -344,5 +356,9 @@ Finished
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/calculator.ts b/i18n/hu/calculator.ts
index edd7e16..5d732d0 100644
--- a/i18n/hu/calculator.ts
+++ b/i18n/hu/calculator.ts
@@ -133,4 +133,203 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/datebook.ts b/i18n/hu/datebook.ts
index 8e7308c..be1d212 100644
--- a/i18n/hu/datebook.ts
+++ b/i18n/hu/datebook.ts
@@ -365,14 +365,6 @@ Mégis kilép?</translation>
     </message>
 </context>
 <context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
@@ -480,7 +472,7 @@ Mégis kilép?</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Kezdő időpont</translation>
+        <translation type="obsolete">Kezdő időpont</translation>
     </message>
     <message>
         <source>All day</source>
@@ -526,6 +518,10 @@ Mégis kilép?</translation>
         <source>Note...</source>
         <translation>Jegyzet...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">Kezdő időpont</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/hu/libbatteryapplet.ts b/i18n/hu/libbatteryapplet.ts
index 8af88c5..08ee50e 100644
--- a/i18n/hu/libbatteryapplet.ts
+++ b/i18n/hu/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation>Nincs elemet tartalmazó kabát a gépen</translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/libqpe.ts b/i18n/hu/libqpe.ts
index 1466f1d..513b137 100644
--- a/i18n/hu/libqpe.ts
+++ b/i18n/hu/libqpe.ts
@@ -860,6 +860,22 @@ Szabadítson fel némi memóriát és próbálja újra.</translation>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Hiba</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/hu/mailit.ts b/i18n/hu/mailit.ts
index 3d729bc..fd9657c 100644
--- a/i18n/hu/mailit.ts
+++ b/i18n/hu/mailit.ts
@@ -200,6 +200,19 @@ Check user name and password&lt;/qt&gt;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/hu/opieftp.ts b/i18n/hu/opieftp.ts
index b837b35..86fd2ef 100644
--- a/i18n/hu/opieftp.ts
+++ b/i18n/hu/opieftp.ts
@@ -231,5 +231,9 @@ It must be empty</source>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/qpe.ts b/i18n/hu/qpe.ts
index b82efbe..e44c163 100644
--- a/i18n/hu/qpe.ts
+++ b/i18n/hu/qpe.ts
@@ -1,17 +1,79 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished">Applikáció probléma</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;%1 nem válaszol.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Akarja, hogy bezárjam az alkalmazást?&lt;p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>Applikáció probléma</translation>
+        <translation type="obsolete">Applikáció probléma</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 nem válaszol.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;%1 nem válaszol.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Akarja, hogy bezárjam az alkalmazást?&lt;p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Akarja, hogy bezárjam az alkalmazást?&lt;p&gt;</translation>
     </message>
 </context>
 <context>
@@ -19,27 +81,27 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>Érintse meg pontosan és határozottan
+        <translation type="obsolete">Érintse meg pontosan és határozottan
 a kereszteket a képernyő kalibrálásához.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Üdvözli önt az Opie</translation>
+        <translation type="obsolete">Üdvözli önt az Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>Dokumentumok</translation>
+        <translation type="obsolete">Dokumentumok</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>Ikon nézet</translation>
+        <translation type="obsolete">Ikon nézet</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>Listanézet</translation>
+        <translation type="obsolete">Listanézet</translation>
     </message>
 </context>
 <context>
@@ -47,58 +109,126 @@ a kereszteket a képernyő kalibrálásához.</translation>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>Az elem szintje kritikus!
+        <translation type="obsolete">Az elem szintje kritikus!
 Tartsa kikapcsolva, amíg az áramellátás visszaáll!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation>Az elem kezd kimerülni.</translation>
+        <translation type="obsolete">Az elem kezd kimerülni.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>A biztonsági-elem szintje nagyon alacsony.
+        <translation type="obsolete">A biztonsági-elem szintje nagyon alacsony.
 Kérem töltse fel a biztonsági-elemt.</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>névjegykártya</translation>
+        <translation type="obsolete">névjegykártya</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished">Információ</translation>
+        <translation type="obsolete">Információ</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
+        <translation type="obsolete">&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
 (%1)&lt;/p&gt;&lt;p&gt;Akarja korrigálni az órát?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">Elem állapot</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation>Indító</translation>
+        <translation type="unfinished">Indító</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation>- Indító</translation>
+        <translation type="unfinished">- Indító</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation>Nincs alkalmazás</translation>
+        <translation type="unfinished">Nincs alkalmazás</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>&lt;p&gt;Ehhez a dokumentumhoz nincs alkalmazás megadva.&lt;p&gt;Típusa: %1.</translation>
+        <translation type="unfinished">&lt;p&gt;Ehhez a dokumentumhoz nincs alkalmazás megadva.&lt;p&gt;Típusa: %1.</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">Dokumentumok</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Finding documents</source>
+        <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished">Ikon nézet</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished">Listanézet</translation>
+    </message>
     <message>
-        <source>Searching documents</source>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -106,152 +236,247 @@ Kérem töltse fel a biztonsági-elemt.</translation>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>%1 fájl</translation>
+        <translation type="obsolete">%1 fájl</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>Minden fájltípus</translation>
+        <translation type="obsolete">Minden fájltípus</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation>Dokumentum nézet</translation>
+        <translation type="unfinished">Dokumentum nézet</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>Eszköz betéve</translation>
+        <translation type="obsolete">Eszköz betéve</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>Egy &lt;b&gt;tároló eszközt&lt;/b&gt; helyezett a gépbe. Keressek rajta média fájlokat?</translation>
+        <translation type="obsolete">Egy &lt;b&gt;tároló eszközt&lt;/b&gt; helyezett a gépbe. Keressek rajta média fájlokat?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Mely média fájlokat</translation>
+        <translation type="obsolete">Mely média fájlokat</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Hang</translation>
+        <translation type="obsolete">Hang</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Kép</translation>
+        <translation type="obsolete">Kép</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Szöveg</translation>
+        <translation type="obsolete">Szöveg</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Videó</translation>
+        <translation type="obsolete">Videó</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Minden</translation>
+        <translation type="obsolete">Minden</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>Csatold az alkalmazásokat</translation>
+        <translation type="obsolete">Csatold az alkalmazásokat</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>Keresés korlátozása a könyvtárra: (még nem használt)</translation>
+        <translation type="obsolete">Keresés korlátozása a könyvtárra: (még nem használt)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>Hozzáad</translation>
+        <translation type="obsolete">Hozzáad</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>A választása az eszközön lesz tárolva.</translation>
+        <translation type="obsolete">A választása az eszközön lesz tárolva.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>Ennél az eszköznél ne kérdezze újra</translation>
+        <translation type="obsolete">Ennél az eszköznél ne kérdezze újra</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation type="unfinished">Elem állapot</translation>
+        <translation type="obsolete">Elem állapot</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Információ</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
+(%1)&lt;/p&gt;&lt;p&gt;Akarja korrigálni az órát?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">Az elem szintje kritikus!
+Tartsa kikapcsolva, amíg az áramellátás visszaáll!</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">A biztonsági-elem szintje nagyon alacsony.
+Kérem töltse fel a biztonsági-elemt.</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished">névjegykártya</translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
-        <translation>Bezárás</translation>
+        <translation type="unfinished">Bezárás</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>Opie bezárása</translation>
+        <translation type="unfinished">Opie bezárása</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation>Újraindít</translation>
+        <translation type="unfinished">Újraindít</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>Opie újraindítása</translation>
+        <translation type="unfinished">Opie újraindítása</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation>Leállítás</translation>
+        <translation type="unfinished">Leállítás</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation>&lt;p&gt;
+        <translation type="unfinished">&lt;p&gt;
 Ezeka bezárási lehetőségek elsősorban az Opie fejlesztése és tesztelése céljából vannak. Egy normális környezetben ezek feleslegesek.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Mégsem</translation>
+        <translation type="unfinished">Mégsem</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation>Leállítás...</translation>
+        <translation type="unfinished">Leállítás...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>Szinkronizációs kapcsolat</translation>
+        <translation type="unfinished">Szinkronizációs kapcsolat</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha a Qtopia Desktop 1.5.1-es verziójánál régebbit használ, kérjük frissítsen.</translation>
+        <translation type="unfinished">&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha a Qtopia Desktop 1.5.1-es verziójánál régebbit használ, kérjük frissítsen.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>Megtagad</translation>
+        <translation type="unfinished">Megtagad</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation>&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha éppen most telepítette a Szinkronozálót először, ez normális.</translation>
+        <translation type="unfinished">&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha éppen most telepítette a Szinkronozálót először, ez normális.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation>Engedélyez</translation>
+        <translation type="unfinished">Engedélyez</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>Szinkronizálás</translation>
+        <translation type="obsolete">Szinkronizálás</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Címlista&lt;b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Címlista&lt;b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Mégsem</translation>
+        <translation type="obsolete">&amp;Mégsem</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/showimg.ts b/i18n/hu/showimg.ts
index 8f08d9e..daea628 100644
--- a/i18n/hu/showimg.ts
+++ b/i18n/hu/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/it/advancedfm.ts b/i18n/it/advancedfm.ts
index ea3bb64..ac14e2f 100644
--- a/i18n/it/advancedfm.ts
+++ b/i18n/it/advancedfm.ts
@@ -100,11 +100,11 @@
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Cambia su Locale</translation>
+        <translation type="obsolete">Cambia su Locale</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Cambia su Remoto</translation>
+        <translation type="obsolete">Cambia su Remoto</translation>
     </message>
     <message>
         <source>Size</source>
@@ -270,6 +270,26 @@ e tutto il suo contenuto ?</translation>
         <translation>Vuoi veramente eliminare
 %1?</translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -362,5 +382,9 @@ Terminato
         <source>Error setting mode</source>
         <translation>Errore impostazioni permessi</translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/calculator.ts b/i18n/it/calculator.ts
index 4c8d4ea..57ec42e 100644
--- a/i18n/it/calculator.ts
+++ b/i18n/it/calculator.ts
@@ -133,4 +133,203 @@
         <translation>Calcolatrice</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished">Standard</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/datebook.ts b/i18n/it/datebook.ts
index f52786f..84a8f8d 100644
--- a/i18n/it/datebook.ts
+++ b/i18n/it/datebook.ts
@@ -370,7 +370,7 @@ Uscire comunque?</translation>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation>LMMGVSDL</translation>
+        <translation type="obsolete">LMMGVSDL</translation>
     </message>
 </context>
 <context>
@@ -524,7 +524,7 @@ Uscire comunque?</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Ora inizio</translation>
+        <translation type="obsolete">Ora inizio</translation>
     </message>
     <message>
         <source>All day</source>
@@ -562,6 +562,10 @@ Uscire comunque?</translation>
         <source>Note...</source>
         <translation>Note...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">Inizio</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/it/libbatteryapplet.ts b/i18n/it/libbatteryapplet.ts
index e69a5a8..7ea03c5 100644
--- a/i18n/it/libbatteryapplet.ts
+++ b/i18n/it/libbatteryapplet.ts
@@ -82,5 +82,17 @@
         <source>No jacket with battery inserted</source>
         <translation>Jacket con batteria non inserito</translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/libqpe.ts b/i18n/it/libqpe.ts
index 4737d44..cc127c1 100644
--- a/i18n/it/libqpe.ts
+++ b/i18n/it/libqpe.ts
@@ -863,6 +863,22 @@ riprovare.</translation>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Errore</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/it/mailit.ts b/i18n/it/mailit.ts
index 49a834a..97de3a7 100644
--- a/i18n/it/mailit.ts
+++ b/i18n/it/mailit.ts
@@ -206,6 +206,19 @@ Controlla username e password&lt;/qt&gt;</translation>
         <translation>OK
 </translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/it/opieftp.ts b/i18n/it/opieftp.ts
index 32db3ef..d6c7a26 100644
--- a/i18n/it/opieftp.ts
+++ b/i18n/it/opieftp.ts
@@ -246,5 +246,9 @@ Deve essere vuota</translation>
         <source>Sorry name already taken</source>
         <translation>Nome già esistente</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/qpe.ts b/i18n/it/qpe.ts
index 10dedec..412401b 100644
--- a/i18n/it/qpe.ts
+++ b/i18n/it/qpe.ts
@@ -1,18 +1,80 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished">Problema Applicazione</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>Problema Applicazione</translation>
+        <translation type="obsolete">Problema Applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -20,27 +82,27 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>Tocca le crocette accuratamente e
+        <translation type="obsolete">Tocca le crocette accuratamente e
 con decisione per tarare il tuo schermo.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Benvenuto in Opie</translation>
+        <translation type="obsolete">Benvenuto in Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>Documenti</translation>
+        <translation type="obsolete">Documenti</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>Mostra Icone</translation>
+        <translation type="obsolete">Mostra Icone</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>Mostra Lista</translation>
+        <translation type="obsolete">Mostra Lista</translation>
     </message>
 </context>
 <context>
@@ -48,211 +110,382 @@ con decisione per tarare il tuo schermo.</translation>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>Il livello della batteria è critico!
+        <translation type="obsolete">Il livello della batteria è critico!
 Tieni spento il dispositivo finchè la batteria non è di nuovo carica!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation>La batteria si sta scaricando.</translation>
+        <translation type="obsolete">La batteria si sta scaricando.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>La batteria di Back-up si sta scaricando.
+        <translation type="obsolete">La batteria di Back-up si sta scaricando.
 Cambiarla subito.</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>biglietto da visita</translation>
+        <translation type="obsolete">biglietto da visita</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>Informazioni</translation>
+        <translation type="obsolete">Informazioni</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;La data di sistema non sembra essere corretta.
+        <translation type="obsolete">&lt;p&gt;La data di sistema non sembra essere corretta.
 (%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">Stato Batteria</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation>Launcher</translation>
+        <translation type="unfinished">Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation> - Launcher</translation>
+        <translation type="unfinished"> - Launcher</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation>Nessuna applicazione</translation>
+        <translation type="unfinished">Nessuna applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>&lt;p&gt;Nessuna applicazione è definita per questo documento.&lt;p&gt;Il tipo è %1.</translation>
+        <translation type="unfinished">&lt;p&gt;Nessuna applicazione è definita per questo documento.&lt;p&gt;Il tipo è %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation>Ricerca documenti</translation>
+        <translation type="obsolete">Ricerca documenti</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation>Ricerca documenti</translation>
+        <translation type="obsolete">Ricerca documenti</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">Documenti</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished">Mostra Icone</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished">Mostra Lista</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>%1 file</translation>
+        <translation type="obsolete">%1 file</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>Tutti i tipi di file</translation>
+        <translation type="obsolete">Tutti i tipi di file</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation>Mostra Documento</translation>
+        <translation type="unfinished">Mostra Documento</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>Supporto inserito</translation>
+        <translation type="obsolete">Supporto inserito</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>Un &lt;b&gt;supporto riscrivibile&lt;/b&gt; è stato inserito. Deve essere esaminato?</translation>
+        <translation type="obsolete">Un &lt;b&gt;supporto riscrivibile&lt;/b&gt; è stato inserito. Deve essere esaminato?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Quale file</translation>
+        <translation type="obsolete">Quale file</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Audio</translation>
+        <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Immagine</translation>
+        <translation type="obsolete">Immagine</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Testo</translation>
+        <translation type="obsolete">Testo</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Video</translation>
+        <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Tutti</translation>
+        <translation type="obsolete">Tutti</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>Link applicazioni</translation>
+        <translation type="obsolete">Link applicazioni</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>Limita ricerca alla dir: (non ancora usata)</translation>
+        <translation type="obsolete">Limita ricerca alla dir: (non ancora usata)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>Aggiungi</translation>
+        <translation type="obsolete">Aggiungi</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>La tua scelta verrà inserita sul supporto.</translation>
+        <translation type="obsolete">La tua scelta verrà inserita sul supporto.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>Non chiedere nuovamente per questo supporto</translation>
+        <translation type="obsolete">Non chiedere nuovamente per questo supporto</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation>Stato Batteria</translation>
+        <translation type="obsolete">Stato Batteria</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Informazioni</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;La data di sistema non sembra essere corretta.
+(%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">Il livello della batteria è critico!
+Tieni spento il dispositivo finchè la batteria non è di nuovo carica!</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">La batteria di Back-up si sta scaricando.
+Cambiarla subito.</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished">biglietto da visita</translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
-        <translation>Chiudi</translation>
+        <translation type="unfinished">Chiudi</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>Chiudi Opie</translation>
+        <translation type="unfinished">Chiudi Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation>Riavvia</translation>
+        <translation type="unfinished">Riavvia</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>Riavvia Opie</translation>
+        <translation type="unfinished">Riavvia Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation>Sospendi</translation>
+        <translation type="unfinished">Sospendi</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation>&lt;p&gt;
+        <translation type="unfinished">&lt;p&gt;
 Queste opzioni di chiusura sono state inserite principalmente per sviluppo e test di Opie. Per un uso normale, queste opzioni non sono necessarie.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Cancella</translation>
+        <translation type="unfinished">Cancella</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation>Sospendi...</translation>
+        <translation type="unfinished">Sospendi...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>Sync Connessione</translation>
+        <translation type="unfinished">Sync Connessione</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se stai utilizzando una versione di Qtopia Desktop più vecchia della 1.5.1, fai l&apos;upgrade.</translation>
+        <translation type="unfinished">&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se stai utilizzando una versione di Qtopia Desktop più vecchia della 1.5.1, fai l&apos;upgrade.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>Nega</translation>
+        <translation type="unfinished">Nega</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation>&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se hai appena iniziato un Sync per la prima volta, questo è normale.</translation>
+        <translation type="unfinished">&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se hai appena iniziato un Sync per la prima volta, questo è normale.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation>Permetti</translation>
+        <translation type="unfinished">Permetti</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>Sincronizzazione</translation>
+        <translation type="obsolete">Sincronizzazione</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Contatti&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Contatti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Cancella</translation>
+        <translation type="obsolete">&amp;Cancella</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/showimg.ts b/i18n/it/showimg.ts
index f2f4675..6449565 100644
--- a/i18n/it/showimg.ts
+++ b/i18n/it/showimg.ts
@@ -122,6 +122,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/mk/advancedfm.ts b/i18n/mk/advancedfm.ts
index 8df713f..b4dd404 100644
--- a/i18n/mk/advancedfm.ts
+++ b/i18n/mk/advancedfm.ts
@@ -129,11 +129,11 @@ It is not bookmarked!</source>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Префрлисе на локална листа</translation>
+        <translation type="obsolete">Префрлисе на локална листа</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Префрли се на Далечинска листа
+        <translation type="obsolete">Префрли се на Далечинска листа
 </translation>
     </message>
     <message>
@@ -267,6 +267,26 @@ Do you really want to delete it?</source>
         <source>Could not rename</source>
         <translation>Неможе да се преименува</translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -356,5 +376,9 @@ Finished
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/calculator.ts b/i18n/mk/calculator.ts
index 296f72b..03a5e34 100644
--- a/i18n/mk/calculator.ts
+++ b/i18n/mk/calculator.ts
@@ -134,4 +134,203 @@
         <translation>Калкулатор</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished">Стандарден</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/datebook.ts b/i18n/mk/datebook.ts
index 2692ebf..f5e151f 100644
--- a/i18n/mk/datebook.ts
+++ b/i18n/mk/datebook.ts
@@ -366,14 +366,6 @@ Quit anyway?</source>
     </message>
 </context>
 <context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
@@ -531,7 +523,7 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Време на почеток</translation>
+        <translation type="obsolete">Време на почеток</translation>
     </message>
     <message>
         <source>All day</source>
@@ -569,6 +561,10 @@ Quit anyway?</source>
         <source>Note...</source>
         <translation>Забелешка...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">Време на почеток</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/mk/libbatteryapplet.ts b/i18n/mk/libbatteryapplet.ts
index 1201f24..42b68fc 100644
--- a/i18n/mk/libbatteryapplet.ts
+++ b/i18n/mk/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation>Нема додатна батерија</translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/libqpe.ts b/i18n/mk/libqpe.ts
index 89b24fa..b4bad0b 100644
--- a/i18n/mk/libqpe.ts
+++ b/i18n/mk/libqpe.ts
@@ -861,6 +861,22 @@ Free some memory and try again.</source>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Грешка</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/mk/mailit.ts b/i18n/mk/mailit.ts
index 4e9462e..3c44535 100644
--- a/i18n/mk/mailit.ts
+++ b/i18n/mk/mailit.ts
@@ -200,6 +200,19 @@ associated to this mail
  it can not be downloaded</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/mk/opieftp.ts b/i18n/mk/opieftp.ts
index 00e7b65..ac2ab78 100644
--- a/i18n/mk/opieftp.ts
+++ b/i18n/mk/opieftp.ts
@@ -241,5 +241,9 @@ It must be empty</source>
         <source>Sorry name already taken</source>
         <translation>Името веќе постои</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/qpe.ts b/i18n/mk/qpe.ts
index 73c5145..3985967 100644
--- a/i18n/mk/qpe.ts
+++ b/i18n/mk/qpe.ts
@@ -1,17 +1,79 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished">Проблем со апликацијата</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>Проблем со апликацијата</translation>
+        <translation type="obsolete">Проблем со апликацијата</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -19,27 +81,27 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>Кликни на крстовите цврсто и 
+        <translation type="obsolete">Кликни на крстовите цврсто и 
 прецизно за да го калибрираш екранот.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Добредојде во Opie</translation>
+        <translation type="obsolete">Добредојде во Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>Документи</translation>
+        <translation type="obsolete">Документи</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>Преглед по икони</translation>
+        <translation type="obsolete">Преглед по икони</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>Преглед по листа</translation>
+        <translation type="obsolete">Преглед по листа</translation>
     </message>
 </context>
 <context>
@@ -47,210 +109,380 @@ accurately to calibrate your screen.</source>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>Нивото на батеријата е критично!</translation>
+        <translation type="obsolete">Нивото на батеријата е критично!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation>Нивото на батеријата е многу ниско.</translation>
+        <translation type="obsolete">Нивото на батеријата е многу ниско.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>Помошната батерија е многу слаба.
+        <translation type="obsolete">Помошната батерија е многу слаба.
 Наполни ја помошната батерија.</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>Визиткарта</translation>
+        <translation type="obsolete">Визиткарта</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished">Информации</translation>
+        <translation type="obsolete">Информации</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;Датумот на системот не е валиден.
+        <translation type="obsolete">&lt;p&gt;Датумот на системот не е валиден.
 (%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
     </message>
 </context>
 <context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">Состојба на батерија</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation>Стартувач</translation>
+        <translation type="unfinished">Стартувач</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation>Барање документи</translation>
+        <translation type="obsolete">Барање документи</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation>Пребарување на документи</translation>
+        <translation type="obsolete">Пребарување на документи</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation>- Стартувач</translation>
+        <translation type="unfinished">- Стартувач</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation>Нема Апликација</translation>
+        <translation type="unfinished">Нема Апликација</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>&lt;p&gt;Нема апликација дефинирана за овој документ.&lt;p&gt;Типот е %1.</translation>
+        <translation type="unfinished">&lt;p&gt;Нема апликација дефинирана за овој документ.&lt;p&gt;Типот е %1.</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">Документи</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished">Преглед по икони</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished">Преглед по листа</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>%1 датотеки</translation>
+        <translation type="obsolete">%1 датотеки</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>Аите типови на датотека</translation>
+        <translation type="obsolete">Аите типови на датотека</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation>Преглед на документи</translation>
+        <translation type="unfinished">Преглед на документи</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>Внесен медиум</translation>
+        <translation type="obsolete">Внесен медиум</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>А &lt;b&gt;медиумот&lt;/b&gt;  е внесен. Да се скенира за мултимедијални датотеки?</translation>
+        <translation type="obsolete">А &lt;b&gt;медиумот&lt;/b&gt;  е внесен. Да се скенира за мултимедијални датотеки?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Кои датотеки</translation>
+        <translation type="obsolete">Кои датотеки</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Аудио</translation>
+        <translation type="obsolete">Аудио</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Слика</translation>
+        <translation type="obsolete">Слика</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Текст</translation>
+        <translation type="obsolete">Текст</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Видео</translation>
+        <translation type="obsolete">Видео</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Сите</translation>
+        <translation type="obsolete">Сите</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>Поврзи апликации</translation>
+        <translation type="obsolete">Поврзи апликации</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>Ограничи пребарување надиректориум: (сеуште не се користи)</translation>
+        <translation type="obsolete">Ограничи пребарување надиректориум: (сеуште не се користи)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>Додај</translation>
+        <translation type="obsolete">Додај</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>Твојата одлука ќе биде снимена на медиумот.</translation>
+        <translation type="obsolete">Твојата одлука ќе биде снимена на медиумот.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>Не го барај овој медиум пак</translation>
+        <translation type="obsolete">Не го барај овој медиум пак</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation>Состојба на батерија</translation>
+        <translation type="obsolete">Состојба на батерија</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Информации</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Датумот на системот не е валиден.
+(%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">Нивото на батеријата е критично!</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">Помошната батерија е многу слаба.
+Наполни ја помошната батерија.</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished">Визиткарта</translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
-        <translation>Изгаси...</translation>
+        <translation type="unfinished">Изгаси...</translation>
     </message>
     <message>
         <source>Terminate</source>
-        <translation>Исклучи</translation>
+        <translation type="unfinished">Исклучи</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>Исклучи Opie</translation>
+        <translation type="unfinished">Исклучи Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation>Рестартирај</translation>
+        <translation type="unfinished">Рестартирај</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>Рестартирај Opie</translation>
+        <translation type="unfinished">Рестартирај Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation>Изгаси</translation>
+        <translation type="unfinished">Изгаси</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation>&lt;p&gt;
+        <translation type="unfinished">&lt;p&gt;
 Овие иоции за гасење се наменети за користење за време на развој и тестирање на Опие системот. Во нормална околина, овие концепти се непотребни.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Откажи</translation>
+        <translation type="unfinished">Откажи</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>Врска за синхронизирање</translation>
+        <translation type="unfinished">Врска за синхронизирање</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Неавторизиран систем бара да се поврзе со овој уред.&lt;p&gt;Aко користите веризја на Qtopia постара од 1.5.1 надградете ја.</translation>
+        <translation type="unfinished">&lt;p&gt;Неавторизиран систем бара да се поврзе со овој уред.&lt;p&gt;Aко користите веризја на Qtopia постара од 1.5.1 надградете ја.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>Одбиј</translation>
+        <translation type="unfinished">Одбиј</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation>&lt;p&gt;Непознат систем бара да се поврзе со овој уред.&lt;p&gt;Aко првпат го имате инсталирано Sync ова е нормално.</translation>
+        <translation type="unfinished">&lt;p&gt;Непознат систем бара да се поврзе со овој уред.&lt;p&gt;Aко првпат го имате инсталирано Sync ова е нормално.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation>Дозволи</translation>
+        <translation type="unfinished">Дозволи</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>Синхронизирање</translation>
+        <translation type="obsolete">Синхронизирање</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Контакти&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Контакти&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Откажи</translation>
+        <translation type="obsolete">&amp;Откажи</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/showimg.ts b/i18n/mk/showimg.ts
index d578f90..81c2d9a 100644
--- a/i18n/mk/showimg.ts
+++ b/i18n/mk/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/nl/advancedfm.ts b/i18n/nl/advancedfm.ts
index 5747db3..0bd609d 100644
--- a/i18n/nl/advancedfm.ts
+++ b/i18n/nl/advancedfm.ts
@@ -125,11 +125,11 @@ er is hier geen favoriet van!</translation>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Schakel naar lokaal</translation>
+        <translation type="obsolete">Schakel naar lokaal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Schakel naar server</translation>
+        <translation type="obsolete">Schakel naar server</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
@@ -259,11 +259,11 @@ Wilt u het echt verwijderen?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
-        <translation type="obsolete">AdvancedFM ::</translation>
+        <translation type="unfinished">AdvancedFM ::</translation>
     </message>
     <message>
         <source> kB free</source>
-        <translation type="obsolete">kB vrij</translation>
+        <translation type="unfinished">kB vrij</translation>
     </message>
     <message>
         <source>Cannot remove current directory
@@ -293,6 +293,18 @@ echt verwijderen?</translation>
         <source>Copy &apos;%1&apos; As</source>
         <translation type="obsolete">Kopiëer &apos;%1&apos; als</translation>
     </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -385,5 +397,9 @@ Klaar
         <source>Error setting mode</source>
         <translation>Fout bij instellen modus</translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/calculator.ts b/i18n/nl/calculator.ts
index 29356da..43b1dfa 100644
--- a/i18n/nl/calculator.ts
+++ b/i18n/nl/calculator.ts
@@ -133,4 +133,203 @@
         <translation>Rekenmachine</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished">Standaard</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/datebook.ts b/i18n/nl/datebook.ts
index 14da3fc..854c918 100644
--- a/i18n/nl/datebook.ts
+++ b/i18n/nl/datebook.ts
@@ -369,7 +369,7 @@ Toch afsluiten?</translation>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation>MDWDVZZM
+        <translation type="obsolete">MDWDVZZM
 
 Weekdagen</translation>
     </message>
@@ -574,7 +574,7 @@ Zondag</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Aanvangstijd</translation>
+        <translation type="obsolete">Aanvangstijd</translation>
     </message>
     <message>
         <source>All day</source>
@@ -612,6 +612,10 @@ Zondag</translation>
         <source>Note...</source>
         <translation>Opmerking...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">Aanvangstijd</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/nl/libbatteryapplet.ts b/i18n/nl/libbatteryapplet.ts
index 6d6252c..004abe5 100644
--- a/i18n/nl/libbatteryapplet.ts
+++ b/i18n/nl/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation>Geen externe batterij aangesloten</translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/libkppp.ts b/i18n/nl/libkppp.ts
index a460335..ac23635 100644
--- a/i18n/nl/libkppp.ts
+++ b/i18n/nl/libkppp.ts
@@ -960,7 +960,7 @@ you setup the modem</source>
     </message>
     <message>
         <source>&amp;Devices</source>
-        <translation>&amp;Apparaten</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1054,7 +1054,7 @@ you setup the modem</source>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annuleer</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modem Query timed out.</source>
@@ -1078,7 +1078,7 @@ you setup the modem</source>
     </message>
     <message>
         <source>Close</source>
-        <translation>Sluit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You&apos;re not allowed to dial out with kppp.
@@ -1200,7 +1200,7 @@ Ask your system administrator to create this file (can be empty) with appropriat
     </message>
     <message>
         <source>Volume:</source>
-        <translation>Volume:</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Session Bill:</source>
diff --git a/i18n/nl/libqpe.ts b/i18n/nl/libqpe.ts
index 00fd430..7c9c4b3 100644
--- a/i18n/nl/libqpe.ts
+++ b/i18n/nl/libqpe.ts
@@ -863,6 +863,22 @@ wilt verwijderen?</translation>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Fout</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/nl/opieftp.ts b/i18n/nl/opieftp.ts
index 8f878d2..b235d17 100644
--- a/i18n/nl/opieftp.ts
+++ b/i18n/nl/opieftp.ts
@@ -243,5 +243,9 @@ Het moet leeg zijn</translation>
         <source>Sorry name already taken</source>
         <translation>Sorry, naam reeds in gebruik</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/qpe.ts b/i18n/nl/qpe.ts
index 0294650..7348d27 100644
--- a/i18n/nl/qpe.ts
+++ b/i18n/nl/qpe.ts
@@ -1,17 +1,79 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished">Programma probleem</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;%1 reageert niet.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Wilt u het programma geforceerd verlaten?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>Programma probleem</translation>
+        <translation type="obsolete">Programma probleem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 reageert niet.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;%1 reageert niet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Wilt u het programma geforceerd verlaten?&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Wilt u het programma geforceerd verlaten?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -19,27 +81,27 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>Raak de richtkruizen duidelijk en
+        <translation type="obsolete">Raak de richtkruizen duidelijk en
 precies aan om het scherm in te stellen.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>Welkom bij Opie</translation>
+        <translation type="obsolete">Welkom bij Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>Documenten</translation>
+        <translation type="obsolete">Documenten</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>Icoonaanzicht</translation>
+        <translation type="obsolete">Icoonaanzicht</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>Lijstaanzicht</translation>
+        <translation type="obsolete">Lijstaanzicht</translation>
     </message>
 </context>
 <context>
@@ -47,31 +109,31 @@ precies aan om het scherm in te stellen.</translation>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>Batterijlading is kritiek!
+        <translation type="obsolete">Batterijlading is kritiek!
 Laat uitgeschakeld tot kan worden opgeladen!</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation>Batterijlading is erg laag.</translation>
+        <translation type="obsolete">Batterijlading is erg laag.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>De reservebatterijlading is erg laag.
+        <translation type="obsolete">De reservebatterijlading is erg laag.
 Reservebatterij opladen aub.</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>visitekaartje</translation>
+        <translation type="obsolete">visitekaartje</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>Informatie</translation>
+        <translation type="obsolete">Informatie</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;De systeemdatum lijkt niet correct.
+        <translation type="obsolete">&lt;p&gt;De systeemdatum lijkt niet correct.
 (%1)&lt;/p&gt;&lt;p&gt;Wilt u deze corrigeren?&lt;/p&gt;</translation>
     </message>
 </context>
@@ -79,186 +141,350 @@ Reservebatterij opladen aub.</translation>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
-        <translation type="obsolete">Batterijstatus</translation>
+        <translation type="unfinished">Batterijstatus</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation>Launcher</translation>
+        <translation type="unfinished">Launcher</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation>Vinden documenten</translation>
+        <translation type="obsolete">Vinden documenten</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation>Zoeken documenten</translation>
+        <translation type="obsolete">Zoeken documenten</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation>- Launcher</translation>
+        <translation type="unfinished">- Launcher</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation>Geen programma</translation>
+        <translation type="unfinished">Geen programma</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>Er is geen programma ingesteld voor dit document.&lt;p&gt;Type is %1.</translation>
+        <translation type="unfinished">Er is geen programma ingesteld voor dit document.&lt;p&gt;Type is %1.</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">Documenten</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished">Icoonaanzicht</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished">Lijstaanzicht</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>%1 bestanden</translation>
+        <translation type="obsolete">%1 bestanden</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>Alle types van bestand</translation>
+        <translation type="obsolete">Alle types van bestand</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation>Documentaanzicht</translation>
+        <translation type="unfinished">Documentaanzicht</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>Ingeschakeld medium</translation>
+        <translation type="obsolete">Ingeschakeld medium</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>Een &lt;b&gt;opslagmedium&lt;/b&gt; is ingeschakeld. Moet dit onderzocht worden op mediabestanden?</translation>
+        <translation type="obsolete">Een &lt;b&gt;opslagmedium&lt;/b&gt; is ingeschakeld. Moet dit onderzocht worden op mediabestanden?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Welke mediabestanden</translation>
+        <translation type="obsolete">Welke mediabestanden</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>Audio</translation>
+        <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>Plaatjes</translation>
+        <translation type="obsolete">Plaatjes</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Tekst</translation>
+        <translation type="obsolete">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>Video</translation>
+        <translation type="obsolete">Video</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>Alle</translation>
+        <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>Koppel programma&apos;s</translation>
+        <translation type="obsolete">Koppel programma&apos;s</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>Beperk zoeken tot map: (nog niet gebruikt)</translation>
+        <translation type="obsolete">Beperk zoeken tot map: (nog niet gebruikt)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>Voeg toe</translation>
+        <translation type="obsolete">Voeg toe</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>Uw beslissing word opgeslagen op het medium.</translation>
+        <translation type="obsolete">Uw beslissing word opgeslagen op het medium.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>Vraag niet nogmaals voor dit medium</translation>
+        <translation type="obsolete">Vraag niet nogmaals voor dit medium</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation>Batterijstatus</translation>
+        <translation type="obsolete">Batterijstatus</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">Informatie</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;De systeemdatum lijkt niet correct.
+(%1)&lt;/p&gt;&lt;p&gt;Wilt u deze corrigeren?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">Batterijlading is kritiek!
+Laat uitgeschakeld tot kan worden opgeladen!</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">De reservebatterijlading is erg laag.
+Reservebatterij opladen aub.</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished">visitekaartje</translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
-        <translation>Afsluiten...</translation>
+        <translation type="unfinished">Afsluiten...</translation>
     </message>
     <message>
         <source>Terminate</source>
-        <translation>Beeindigen</translation>
+        <translation type="unfinished">Beeindigen</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>Opie beeindigen</translation>
+        <translation type="unfinished">Opie beeindigen</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation>Herstarten</translation>
+        <translation type="unfinished">Herstarten</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>Opie herstarten</translation>
+        <translation type="unfinished">Opie herstarten</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation>Afsluiten</translation>
+        <translation type="unfinished">Afsluiten</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation>&lt;p&gt;
+        <translation type="unfinished">&lt;p&gt;
 Deze afsluitopties worden voornamelijk voor gebruik tijdens ontwikkeling en tests van het Opie systeem. In een normale omgeving zijn deze opties niet nodig.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Annuleren</translation>
+        <translation type="unfinished">Annuleren</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>Synchronisatieverbinding</translation>
+        <translation type="unfinished">Synchronisatieverbinding</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>Een niet geautoriseerd systeem probeert toegang te krijgen tot dit apparaat.&lt;p&gt;Aub upgraden als u een versie van Qtopia desktop ouder dan 1.5.1 gebruikt.</translation>
+        <translation type="unfinished">Een niet geautoriseerd systeem probeert toegang te krijgen tot dit apparaat.&lt;p&gt;Aub upgraden als u een versie van Qtopia desktop ouder dan 1.5.1 gebruikt.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>Weiger</translation>
+        <translation type="unfinished">Weiger</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation>&lt;p&gt;Een onbekend systeem probeert toegang te krijgen tot dit apparaat. Dit is normaal als dit de eerste keer is dat u synchroniseert.</translation>
+        <translation type="unfinished">&lt;p&gt;Een onbekend systeem probeert toegang te krijgen tot dit apparaat. Dit is normaal als dit de eerste keer is dat u synchroniseert.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation>Sta toe</translation>
+        <translation type="unfinished">Sta toe</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>Synchroniseren</translation>
+        <translation type="obsolete">Synchroniseren</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Kontakten&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Kontakten&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Annuleren</translation>
+        <translation type="obsolete">&amp;Annuleren</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/showimg.ts b/i18n/nl/showimg.ts
index d2e2208..604d9b7 100644
--- a/i18n/nl/showimg.ts
+++ b/i18n/nl/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/no/advancedfm.ts b/i18n/no/advancedfm.ts
index 9a692b9..e0b6f28 100644
--- a/i18n/no/advancedfm.ts
+++ b/i18n/no/advancedfm.ts
@@ -117,11 +117,11 @@ og er GPL lisensiert</translation>
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Bytt til lokal</translation>
+        <translation type="obsolete">Bytt til lokal</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Bytt til ekstern</translation>
+        <translation type="obsolete">Bytt til ekstern</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
@@ -262,6 +262,26 @@ and all it&apos;s contents ?</source>
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -351,5 +371,9 @@ Finished
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/calculator.ts b/i18n/no/calculator.ts
index 2f945c2..958c4c3 100644
--- a/i18n/no/calculator.ts
+++ b/i18n/no/calculator.ts
@@ -133,4 +133,203 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/datebook.ts b/i18n/no/datebook.ts
index 2020a7d..955ce20 100644
--- a/i18n/no/datebook.ts
+++ b/i18n/no/datebook.ts
@@ -360,14 +360,6 @@ Quit anyway?</source>
     </message>
 </context>
 <context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
@@ -482,10 +474,6 @@ Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
@@ -521,6 +509,10 @@ Quit anyway?</source>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/no/libbatteryapplet.ts b/i18n/no/libbatteryapplet.ts
index c9fe974..bb236e1 100644
--- a/i18n/no/libbatteryapplet.ts
+++ b/i18n/no/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/libqpe.ts b/i18n/no/libqpe.ts
index 935ab0b..df7c1bc 100644
--- a/i18n/no/libqpe.ts
+++ b/i18n/no/libqpe.ts
@@ -846,6 +846,22 @@ Free some memory and try again.</source>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/no/mailit.ts b/i18n/no/mailit.ts
index 3d729bc..fd9657c 100644
--- a/i18n/no/mailit.ts
+++ b/i18n/no/mailit.ts
@@ -200,6 +200,19 @@ Check user name and password&lt;/qt&gt;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/no/opieftp.ts b/i18n/no/opieftp.ts
index 8f9d52e..84bc0c7 100644
--- a/i18n/no/opieftp.ts
+++ b/i18n/no/opieftp.ts
@@ -231,5 +231,9 @@ It must be empty</source>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/qpe.ts b/i18n/no/qpe.ts
index 73a6c49..dde7446 100644
--- a/i18n/no/qpe.ts
+++ b/i18n/no/qpe.ts
@@ -1,6 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppMonitor</name>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
@@ -13,76 +28,96 @@
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Calibrate</name>
     <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Welcome to Opie</source>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
     <message>
-        <source>Documents</source>
+        <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Icon View</source>
+        <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>List View</source>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DesktopApplication</name>
+    <name>DesktopPowerAlerter</name>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
+        <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery is running very low.</source>
+        <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>FirstUse</name>
     <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
+        <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>business card</source>
+        <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Launcher</name>
+    <name>InputMethods</name>
     <message>
-        <source>Launcher</source>
+        <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Launcher</name>
     <message>
-        <source>Finding documents</source>
+        <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching documents</source>
+        <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -97,15 +132,34 @@ Please charge the back-up battery.</source>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>LauncherView</name>
+    <name>LauncherTabWidget</name>
     <message>
-        <source>%1 files</source>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All types of file</source>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -114,64 +168,82 @@ Please charge the back-up battery.</source>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Medium inserted</source>
+        <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ServerApplication</name>
     <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Which media files</source>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Audio</source>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
+        <source>Battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Video</source>
+        <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link apps</source>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Limit search to dir: (not used yet)</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add</source>
+        <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Your decision will be stored on the medium.</source>
+        <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do not ask again for this medium</source>
+        <source>Memory Low
+Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Battery Status</source>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -237,15 +309,11 @@ These termination options are provided primarily for use while developing and te
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
+        <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
+        <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/no/showimg.ts b/i18n/no/showimg.ts
index c04fa35..bb5b89a 100644
--- a/i18n/no/showimg.ts
+++ b/i18n/no/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/pl/addressbook.ts b/i18n/pl/addressbook.ts
index 9cfdc2e..c10fa7f 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -11,7 +11,7 @@
     </message>
     <message>
         <source>Pick</source>
-        <translation>Elita</translation>
+        <translation>Wybór</translation>
     </message>
 </context>
 <context>
@@ -286,15 +286,15 @@ dostepny za darmo!</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
-        <translation type="unfinished">&quot;Widget&quot; wyszukiwarki bedzie oczekiwal wyrazen regularnych</translation>
+        <translation>Obiekt wyszukiwarki bedzie oczekiwal wyrazen regularnych</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
-        <translation type="unfinished">&quot;Widget&quot; wyszukiwarki oczekuje tylko prostych znakow specjalnych</translation>
+        <translation>Obiekt wyszukiwarki oczekuje tylko prostych znakow specjalnych</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
-        <translation type="unfinished">Wyszukiwarka bedzie rozrozniala wielkosc znakow</translation>
+        <translation>Wyszukiwarka bedzie rozrozniala wielkosc znakow</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
@@ -681,7 +681,7 @@ dostepny za darmo!</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
-        <translation type="unfinished">Wyspy Faroe</translation>
+        <translation>Wyspy Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
@@ -713,7 +713,7 @@ dostepny za darmo!</translation>
     </message>
     <message>
         <source>Georgia</source>
-        <translation type="unfinished">Georgia</translation>
+        <translation>Georgia</translation>
     </message>
     <message>
         <source>Germany</source>
diff --git a/i18n/pl/advancedfm.ts b/i18n/pl/advancedfm.ts
index 6e51c54..db2bbda 100644
--- a/i18n/pl/advancedfm.ts
+++ b/i18n/pl/advancedfm.ts
@@ -39,11 +39,11 @@
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation type="unfinished">Przelacz na lokalne</translation>
+        <translation type="obsolete">Przelacz na lokalne</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation type="unfinished">przelacz na zdalne</translation>
+        <translation type="obsolete">przelacz na zdalne</translation>
     </message>
     <message>
         <source>Size</source>
@@ -87,11 +87,11 @@
     </message>
     <message>
         <source>AdvancedFm Output</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyjscie AdvancedFm</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
-        <translation type="unfinished"></translation>
+        <translation>Emisja AdvancedFm</translation>
     </message>
     <message>
         <source>Ir sent.</source>
@@ -143,11 +143,11 @@
     </message>
     <message>
         <source>Copy </source>
-        <translation type="unfinished">Kopiuj</translation>
+        <translation>Kopiuj</translation>
     </message>
     <message>
         <source> As</source>
-        <translation type="unfinished">Jako</translation>
+        <translation>Jako</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
@@ -226,7 +226,10 @@ Czy na pewno chcesz go usunac?</translation>
 is copyright 2002-2003 by
 L.J.Potter&lt;llornkcor@handhelds.org&gt;
 and is licensed by the GPL</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaawansowany Menedzer Plikow
+prawa autorskie 2002-2003
+L.J.Potter&lt;llornkcor@handhelds.org&gt;
+na licencji GPL</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
@@ -264,6 +267,26 @@ wraz z zawartoscia?</translation>
         <translation>Czy na pewno usunac
 %1?</translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation>AdvancedFm ::</translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation>kB wolne</translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation>Przelacz na Widok 1</translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation>Przelacz na widok 2</translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation>Jeszcze niezaimplementowane</translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -277,18 +300,18 @@ wraz z zawartoscia?</translation>
     </message>
     <message>
         <source>Process could not start</source>
-        <translation type="unfinished"></translation>
+        <translation>Proces nie mogl rozpoczac dzialania</translation>
     </message>
     <message>
         <source>Error
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>
 Finished
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Skonczone</translation>
     </message>
 </context>
 <context>
@@ -335,23 +358,27 @@ Finished
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Ostrzezenie</translation>
     </message>
     <message>
         <source>Error- no user</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad - brak uzytkownika</translation>
     </message>
     <message>
         <source>Error- no  group</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad - brak grupy</translation>
     </message>
     <message>
         <source>Error setting ownership or group</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad podczas ustawiania grupy</translation>
     </message>
     <message>
         <source>Error setting mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad podczas ustawiania uprawnien</translation>
+    </message>
+    <message>
+        <source>filePermissions</source>
+        <translation>uprawnieniaPliku</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/aqpkg.ts b/i18n/pl/aqpkg.ts
index 76dfbf6..9117031 100644
--- a/i18n/pl/aqpkg.ts
+++ b/i18n/pl/aqpkg.ts
@@ -111,7 +111,7 @@
     </message>
     <message>
         <source>%1 Kb</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Kb</translation>
     </message>
 </context>
 <context>
@@ -161,80 +161,81 @@
     <name>Ipkg</name>
     <message>
         <source>Dealing with package %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Przetwarzanie pakietu %1</translation>
     </message>
     <message>
         <source>Removing symbolic links...
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Usuwanie linkow symbolicznych...
+</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tworzenie linkow symbolicznych dla %1.</translation>
     </message>
     <message>
         <source>Creating symbolic links for %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Tworzenie linkow symbolicznych dla %1</translation>
     </message>
     <message>
         <source>Finished</source>
-        <translation type="unfinished"></translation>
+        <translation>Skonczone</translation>
     </message>
     <message>
         <source>Removing status entry...</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuwanie wpisu statusu...</translation>
     </message>
     <message>
         <source>status file - </source>
-        <translation type="unfinished"></translation>
+        <translation>plik statusu -</translation>
     </message>
     <message>
         <source>package - </source>
-        <translation type="unfinished"></translation>
+        <translation>pakiet - </translation>
     </message>
     <message>
         <source>Couldn&apos;t open status file - </source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna otworzyc pliku statusu - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna utworzyc tymczasowego pliku statusu - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna rozpoczac procesu ipkg</translation>
     </message>
     <message>
         <source>Could not open :</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna otworzyc: </translation>
     </message>
     <message>
         <source>Creating directory </source>
-        <translation type="unfinished"></translation>
+        <translation>Tworzenie katalogu</translation>
     </message>
     <message>
         <source>Linked %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 zlinkowany do %2</translation>
     </message>
     <message>
         <source>Failed to link %1 to %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie udalo sie zlinkowanie %1 do %2</translation>
     </message>
     <message>
         <source>Removed %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuniete %1</translation>
     </message>
     <message>
         <source>Failed to remove %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie udalo sie usuniecie %1</translation>
     </message>
     <message>
         <source>Removed </source>
-        <translation type="unfinished"></translation>
+        <translation>Usuniete</translation>
     </message>
     <message>
         <source>Failed to remove </source>
-        <translation type="unfinished"></translation>
+        <translation>Nie udalo sie usunac</translation>
     </message>
 </context>
 <context>
@@ -562,37 +563,38 @@ Czy jestes pewien?</translation>
     <name>QObject</name>
     <message>
         <source>Installed packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Zainstalowane pakiety</translation>
     </message>
     <message>
         <source>Local packages</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokalne pakiety</translation>
     </message>
     <message>
         <source>N/A</source>
-        <translation type="unfinished"></translation>
+        <translation>niedostepne</translation>
     </message>
     <message>
         <source>Package - %1
               version - %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Pakiet - %1
+             wersja - %2</translation>
     </message>
     <message>
         <source>
               inst version - %1</source>
-        <translation type="unfinished"></translation>
+        <translation>zainst. wersja - %1</translation>
     </message>
     <message>
         <source>Version string is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation>Numer wersji jest pusty.</translation>
     </message>
     <message>
         <source>Epoch in version is not number.</source>
-        <translation type="unfinished"></translation>
+        <translation>Czas w wersji nie jest liczba.</translation>
     </message>
     <message>
         <source>Nothing after colon in version number.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie ma nic po dwukropku w numerze wersji.</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pl/backgammon.ts b/i18n/pl/backgammon.ts
index 5f9519d..579bb00 100644
--- a/i18n/pl/backgammon.ts
+++ b/i18n/pl/backgammon.ts
@@ -3,164 +3,168 @@
     <name>AI_Dialog</name>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia</translation>
     </message>
     <message>
         <source>&lt;b&gt;Rescue&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Ratuj&lt;/b&gt;</translation>
     </message>
     <message>
         <source>?</source>
-        <translation type="unfinished"></translation>
+        <translation>?</translation>
     </message>
     <message>
         <source>&lt;b&gt;Eliminate&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Eliminuj&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Expose&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Ujawnij&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Protect&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Chron&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Safe&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Bezpieczny&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Empty&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Pusty&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Default Values</source>
-        <translation type="unfinished"></translation>
+        <translation>Wartosci Domyslne</translation>
     </message>
     <message>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Pomoc</translation>
     </message>
     <message>
         <source>Bring the pieces out of the endzone</source>
-        <translation type="unfinished"></translation>
+        <translation>Przenies pionki ze strefy koncowej</translation>
     </message>
     <message>
         <source>Eliminate an opponents piece</source>
-        <translation type="unfinished"></translation>
+        <translation>Eliminuj pionek przeciwnika</translation>
     </message>
     <message>
         <source>Expose you own pieces.
 After such a move only one piece will remain in the slot</source>
-        <translation type="unfinished"></translation>
+        <translation>Ujawnij swoje pionki.
+Po takim ruchu w gniezdzie zostanie tylko jeden pionek</translation>
     </message>
     <message>
         <source>Protect a single piece by
 putting another one in this slot</source>
-        <translation type="unfinished"></translation>
+        <translation>Chron pojedynczy pionek
+wstawiajac inny w to gniazdo</translation>
     </message>
     <message>
         <source>Move piece to a slot already
 occupied by the player</source>
-        <translation type="unfinished"></translation>
+        <translation>Przesun pionek do gniazda juz
+zajetego przez gracza</translation>
     </message>
     <message>
         <source>Move piece to an empty slot</source>
-        <translation type="unfinished"></translation>
+        <translation>Przesun pionek do pustego gniazda</translation>
     </message>
     <message>
         <source>Press and hold the ? buttton
 next to a field for help</source>
-        <translation type="unfinished"></translation>
+        <translation>Aby otrzymac pomoc wcisnij i przytrzymaj 
+przycisk ? obok pola</translation>
     </message>
 </context>
 <context>
     <name>BackGammon</name>
     <message>
         <source>Backgammon</source>
-        <translation type="unfinished"></translation>
+        <translation>Backgammon</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowa</translation>
     </message>
     <message>
         <source>Load</source>
-        <translation type="unfinished"></translation>
+        <translation>Laduj</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Game</source>
-        <translation type="unfinished"></translation>
+        <translation>Gra</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslne</translation>
     </message>
     <message>
         <source>Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Motyw</translation>
     </message>
     <message>
         <source>Player</source>
-        <translation type="unfinished"></translation>
+        <translation>Gracz</translation>
     </message>
     <message>
         <source>AI</source>
-        <translation type="unfinished"></translation>
+        <translation>SI</translation>
     </message>
     <message>
         <source>Rules</source>
-        <translation type="unfinished"></translation>
+        <translation>Reguly</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcje</translation>
     </message>
     <message>
         <source>deleted theme %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>usuniety motyw %1?</translation>
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <source>Load Theme</source>
-        <translation type="unfinished"></translation>
+        <translation>Laduj Motyw</translation>
     </message>
     <message>
         <source>&lt;b&gt;no move&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;brak ruchu&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Player 1 wins. Click on board for new game.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Wygrywa Gracz 1. Kliknij na planszy aby zaczac nowa gre.&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Player 2 wins. Click on board for new game.&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Wygrywa Gracz 2. Kliknij na planszy aby zaczac nowa gre.&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;P2 turn&lt;/b&gt;</source>
         <comment>P means player</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Kolej G2&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;P1 turn&lt;/b&gt;</source>
         <comment>P means player</comment>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Kolej G1&lt;/b&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/backup.ts b/i18n/pl/backup.ts
index 1d04af7..d5cd1f1 100644
--- a/i18n/pl/backup.ts
+++ b/i18n/pl/backup.ts
@@ -12,47 +12,48 @@
     <message>
         <source>Error from System:
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Blad z Systemu:
+</translation>
     </message>
     <message>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomosc</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
-        <translation type="unfinished"></translation>
+        <translation>Tworzenie kopii sie nie powiodlo!</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Szczegoly</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
-        <translation type="unfinished"></translation>
+        <translation>Backup and Restore.. Porazka!!</translation>
     </message>
     <message>
         <source>Backup Successfull.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tworzenie kopii udalo sie.</translation>
     </message>
     <message>
         <source>Please select something to restore.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybiez cos do odtworzenia.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Odzyskiwanie sie nie powiodlo.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna otworzyc pliku: %1</translation>
     </message>
     <message>
         <source>Restore Successfull.</source>
-        <translation type="unfinished"></translation>
+        <translation>Odzyskiwanie udalo sie.</translation>
     </message>
 </context>
 <context>
@@ -95,22 +96,22 @@
     </message>
     <message>
         <source>Update Filelist</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizuj liste plikow</translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje o bledzie</translation>
     </message>
     <message>
         <source>Error Message:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tresc Bledu:</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;OK</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/bounce.ts b/i18n/pl/bounce.ts
index 9baa618..58d1f9b 100644
--- a/i18n/pl/bounce.ts
+++ b/i18n/pl/bounce.ts
@@ -3,7 +3,7 @@
     <name>KJezzball</name>
     <message>
         <source>Bounce</source>
-        <translation type="unfinished"></translation>
+        <translation>Bounce</translation>
     </message>
     <message>
         <source>&amp;New game</source>
@@ -39,7 +39,7 @@
     </message>
     <message>
         <source>Bounce Level %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 Poziom Bounce</translation>
     </message>
     <message>
         <source>Score: %1</source>
@@ -76,7 +76,8 @@ Punkty: %1</translation>
     <message>
         <source>Successfully cleared more than 75%.
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Ukonczone ponad 75%.
+</translation>
     </message>
     <message>
         <source>%1 points: 15 points per life
@@ -104,7 +105,7 @@ Tym razem otrzymujesz %2 zyc!</translation>
     </message>
     <message>
         <source>About</source>
-        <translation type="unfinished"></translation>
+        <translation>O</translation>
     </message>
     <message>
         <source>Written by: Stefan Schimanski
diff --git a/i18n/pl/calculator.ts b/i18n/pl/calculator.ts
index b25e304..5d99332 100644
--- a/i18n/pl/calculator.ts
+++ b/i18n/pl/calculator.ts
@@ -133,4 +133,203 @@
         <translation>Standard</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation>Standardowy</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation>Waga</translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation>Odleglosc</translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation>Powierzchnia</translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation>Temperatury</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Dzwiek</translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation>akry</translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation>°C</translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation>karaty</translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation>cm sz</translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation>st sz</translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation>cal sz</translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation>°F</translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation>fl oz (US)</translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation>st</translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation>g</translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation>gal (US)</translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation>hektary</translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation>cal</translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation>km</translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation>l</translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished">lb</translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished">tony Lg</translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation>mg</translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished">mi</translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation>ml</translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation>mm</translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation>mi mor</translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished">oz</translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation>punkty</translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished">pt</translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished">qt</translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation>cm kw</translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation>st kw</translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation>cal kw</translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation>km kw</translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation>m kw</translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation>mi kw</translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation>mm kw</translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished">yd kw</translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished">st</translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished">tony st</translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation>lyzka stolowa</translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation>lyzeczka</translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished">yd</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/calibrate.ts b/i18n/pl/calibrate.ts
index 6af2a57..3434d1e 100644
--- a/i18n/pl/calibrate.ts
+++ b/i18n/pl/calibrate.ts
@@ -4,11 +4,12 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dotknij mocno i dokladnie krzyzyka
+zeby skalibrowac ekran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Witamy w Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/checkbook.ts b/i18n/pl/checkbook.ts
index 87a0025..a421c8d 100644
--- a/i18n/pl/checkbook.ts
+++ b/i18n/pl/checkbook.ts
@@ -43,7 +43,7 @@
     </message>
     <message>
         <source>Checking</source>
-        <translation type="unfinished"></translation>
+        <translation>Czeki</translation>
     </message>
     <message>
         <source>CD</source>
@@ -51,11 +51,11 @@
     </message>
     <message>
         <source>Money market</source>
-        <translation type="unfinished"></translation>
+        <translation>Rynek finansowy</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
+        <translation>Wspolny fundusz</translation>
     </message>
     <message>
         <source>Other</source>
@@ -518,7 +518,7 @@ Wpisana wartosc powinna byc liczba dodatnia.</translation>
     </message>
     <message>
         <source>Electronics</source>
-        <translation type="unfinished"></translation>
+        <translation>Elektronika</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/clock.ts b/i18n/pl/clock.ts
index 53a4c84..3a0eebb 100644
--- a/i18n/pl/clock.ts
+++ b/i18n/pl/clock.ts
@@ -51,7 +51,7 @@
     </message>
     <message>
         <source>Alarm set: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarm ustawiony: %1</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pl/datebook.ts b/i18n/pl/datebook.ts
index 5ef4c55..e813507 100644
--- a/i18n/pl/datebook.ts
+++ b/i18n/pl/datebook.ts
@@ -97,7 +97,7 @@ Wyjsc ?</translation>
     </message>
     <message>
         <source>error box</source>
-        <translation type="unfinished"></translation>
+        <translation>okienko bledu</translation>
     </message>
 </context>
 <context>
@@ -198,7 +198,7 @@ Wyjsc ?</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
-        <translation type="unfinished"></translation>
+        <translation>Emituj to wydarzenie</translation>
     </message>
 </context>
 <context>
@@ -365,14 +365,6 @@ Wyjsc ?</translation>
     </message>
 </context>
 <context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
@@ -515,7 +507,7 @@ Wyjsc ?</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Poczatek</translation>
+        <translation type="obsolete">Poczatek</translation>
     </message>
     <message>
         <source>All day</source>
@@ -561,12 +553,16 @@ Wyjsc ?</translation>
         <source>Note...</source>
         <translation>Notatki...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation>Poczatek</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje</translation>
     </message>
 </context>
 <context>
@@ -592,7 +588,7 @@ Wyjsc ?</translation>
     </message>
     <message>
         <source>Every</source>
-        <translation>Kazdy</translation>
+        <translation>Co</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
@@ -666,11 +662,11 @@ Wyjsc ?</translation>
     </message>
     <message>
         <source>day(s)</source>
-        <translation>dzienne</translation>
+        <translation>dni</translation>
     </message>
     <message>
         <source>week(s)</source>
-        <translation>tygodniowe</translation>
+        <translation>tygodni</translation>
     </message>
     <message>
         <source>Repeat By</source>
@@ -732,7 +728,7 @@ i </translation>
     </message>
     <message>
         <source>on </source>
-        <translation type="unfinished"></translation>
+        <translation>w</translation>
     </message>
 </context>
 <context>
@@ -763,7 +759,7 @@ i </translation>
     </message>
     <message>
         <source>Every:</source>
-        <translation>Kazdego:</translation>
+        <translation>Co:</translation>
     </message>
     <message>
         <source>Frequency</source>
@@ -771,7 +767,7 @@ i </translation>
     </message>
     <message>
         <source>End On:</source>
-        <translation>Konic o:</translation>
+        <translation>Koniec:</translation>
     </message>
     <message>
         <source>No End Date</source>
@@ -779,7 +775,7 @@ i </translation>
     </message>
     <message>
         <source>Repeat On</source>
-        <translation>Powtarzaj o:</translation>
+        <translation>Powtarzaj w</translation>
     </message>
     <message>
         <source>Mon</source>
@@ -799,7 +795,7 @@ i </translation>
     </message>
     <message>
         <source>Fri</source>
-        <translation>Pio</translation>
+        <translation>Pia</translation>
     </message>
     <message>
         <source>Sat</source>
@@ -811,7 +807,7 @@ i </translation>
     </message>
     <message>
         <source>Every</source>
-        <translation>Kazdego</translation>
+        <translation>Co</translation>
     </message>
     <message>
         <source>Var1</source>
diff --git a/i18n/pl/drawpad.ts b/i18n/pl/drawpad.ts
index 8cbf1c6..7fae2fd 100644
--- a/i18n/pl/drawpad.ts
+++ b/i18n/pl/drawpad.ts
@@ -111,11 +111,11 @@
     </message>
     <message>
         <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
+        <translation>Miniaturki</translation>
     </message>
     <message>
         <source>Thumbnail View...</source>
-        <translation type="unfinished"></translation>
+        <translation>Miniaturki...</translation>
     </message>
     <message>
         <source>Page Information</source>
@@ -229,7 +229,7 @@ wszystkie strony?</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
-        <translation type="unfinished"></translation>
+        <translation>DrawPad - Strona %1/%2</translation>
     </message>
 </context>
 <context>
@@ -268,7 +268,7 @@ wszystkie strony?</translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
-        <translation type="unfinished"></translation>
+        <translation>DrawPad - Eksport</translation>
     </message>
     <message>
         <source>All Images</source>
@@ -287,7 +287,7 @@ wszystkie strony?</translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
-        <translation type="unfinished"></translation>
+        <translation>DrawPad - Import</translation>
     </message>
     <message>
         <source>All images</source>
@@ -394,7 +394,7 @@ wszystkie strony?</translation>
     <name>ThumbnailView</name>
     <message>
         <source>DrawPad - Thumbnail View</source>
-        <translation type="unfinished"></translation>
+        <translation>DrawPad - Miniaturki</translation>
     </message>
     <message>
         <source>Clear Page</source>
diff --git a/i18n/pl/euroconv.ts b/i18n/pl/euroconv.ts
index 3b1456a..5f508d1 100644
--- a/i18n/pl/euroconv.ts
+++ b/i18n/pl/euroconv.ts
@@ -3,7 +3,7 @@
     <name>QObject</name>
     <message>
         <source>Euroconv</source>
-        <translation type="unfinished"></translation>
+        <translation>Euroconv</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/formatter.ts b/i18n/pl/formatter.ts
index 1cfe32c..dcd5cae 100644
--- a/i18n/pl/formatter.ts
+++ b/i18n/pl/formatter.ts
@@ -173,40 +173,48 @@ zostal zamontowany.</translation>
 Changing parameters on this
 page may cause your system
 to stop functioning properly!</source>
-        <translation type="unfinished"></translation>
+        <translation>UWAGA:
+Zmiana parametrow na tej
+stronie moe spowodowac nieprawidlowe
+funkcjonowanie systemu!</translation>
     </message>
     <message>
         <source>Format?</source>
-        <translation type="unfinished"></translation>
+        <translation>Formatowac?</translation>
     </message>
     <message>
         <source>
 with %1 filesystem?
 You will loose all data!!</source>
-        <translation type="unfinished"></translation>
+        <translation>
+na system %1?
+Stracisz wszystkie dane!!</translation>
     </message>
     <message>
         <source>Trying to umount %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Odmontowuje %1.</translation>
     </message>
     <message>
         <source>Trying to mount %1.</source>
-        <translation type="unfinished"></translation>
+        <translation>Montuje %1.</translation>
     </message>
     <message>
         <source>%1
 has been successfully mounted.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1
+zostal zamontowany.</translation>
     </message>
     <message>
         <source>Storage Type: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ Nosnika: %1</translation>
     </message>
     <message>
         <source>Type: %1
 Formatted with %2
 %3, %4, %5</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ: %1
+Zformatowany na %2
+%3, %4, %5</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/go.ts b/i18n/pl/go.ts
index 3c8fab0..bffe22d 100644
--- a/i18n/pl/go.ts
+++ b/i18n/pl/go.ts
@@ -38,7 +38,7 @@
     </message>
     <message>
         <source>A draw.</source>
-        <translation type="unfinished"></translation>
+        <translation>Remis.</translation>
     </message>
     <message>
         <source>I pass</source>
diff --git a/i18n/pl/helpbrowser.ts b/i18n/pl/helpbrowser.ts
index 2c48923..96bd15a 100644
--- a/i18n/pl/helpbrowser.ts
+++ b/i18n/pl/helpbrowser.ts
@@ -31,7 +31,7 @@
     </message>
     <message>
         <source>Go</source>
-        <translation type="unfinished"></translation>
+        <translation>Idz</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/keypebble.ts b/i18n/pl/keypebble.ts
index 7ed2803..d4efb67 100644
--- a/i18n/pl/keypebble.ts
+++ b/i18n/pl/keypebble.ts
@@ -42,7 +42,7 @@ polaczenie.</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad protokolu: Id Wiadomosci %1 znalezione zamiast oczekiwanej wiadomosci o aktualizacji.</translation>
     </message>
     <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
@@ -206,7 +206,7 @@ sprobuj pozniej.</translation>
     </message>
     <message>
         <source>Raise on bell</source>
-        <translation type="unfinished"></translation>
+        <translation>Podnies z dzwonkiem</translation>
     </message>
     <message>
         <source>Request shared session</source>
@@ -226,7 +226,7 @@ sprobuj pozniej.</translation>
     </message>
     <message>
         <source>Scale Factor</source>
-        <translation type="unfinished"></translation>
+        <translation>Wspolczynnik Skali</translation>
     </message>
     <message>
         <source>Encodings</source>
@@ -246,7 +246,7 @@ sprobuj pozniej.</translation>
     </message>
     <message>
         <source>Copy rectangle encoding</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj kodowanie prostokata</translation>
     </message>
     <message>
         <source>The password of the VNC server</source>
@@ -254,7 +254,7 @@ sprobuj pozniej.</translation>
     </message>
     <message>
         <source>Toggle obscuring the password</source>
-        <translation type="unfinished"></translation>
+        <translation>Przelacz maskowanie hasla</translation>
     </message>
     <message>
         <source>The name of the VNC server</source>
@@ -270,11 +270,11 @@ sprobuj pozniej.</translation>
     </message>
     <message>
         <source>Delay between requesting updates from the server</source>
-        <translation type="unfinished"></translation>
+        <translation>Opoznienie pomiedzy zadaniami aktualizacji z serwera</translation>
     </message>
     <message>
         <source>Request that the VNC server transfer 8 bit color</source>
-        <translation type="unfinished"></translation>
+        <translation>Zadaj, zeby serwer VNC transferowal 8 bitowy kolor</translation>
     </message>
     <message>
         <source>Allow other users to connect to the VNC server</source>
@@ -286,7 +286,7 @@ sprobuj pozniej.</translation>
     </message>
     <message>
         <source>Enable transmiting identical rectangles as references to existing data</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlacz transmitowanie identycznych prostokatow jako odnosniki do istniejacych danych</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/kpacman.ts b/i18n/pl/kpacman.ts
index ca93483..1779a2a 100644
--- a/i18n/pl/kpacman.ts
+++ b/i18n/pl/kpacman.ts
@@ -83,7 +83,7 @@ the last 10 years of her friendship.
     </message>
     <message>
         <source>KPacman</source>
-        <translation type="unfinished"></translation>
+        <translation>KPacman</translation>
     </message>
 </context>
 <context>
@@ -160,7 +160,7 @@ or is of an unknown format.</source>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
-        <translation type="unfinished"></translation>
+        <translation>PORT NA QTOPIA: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
@@ -171,15 +171,15 @@ or is of an unknown format.</source>
     <name>Score</name>
     <message>
         <source>  1UP </source>
-        <translation type="unfinished"></translation>
+        <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
-        <translation type="unfinished"></translation>
+        <translation>WYSOKI WYNIK</translation>
     </message>
     <message>
         <source>  2UP </source>
-        <translation type="unfinished"></translation>
+        <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
@@ -195,7 +195,7 @@ or is of an unknown format.</source>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
-        <translation type="unfinished"></translation>
+        <translation>RNK   PUNKTY  IMIE   DATA</translation>
     </message>
     <message>
         <source>PAUSED</source>
@@ -203,11 +203,7 @@ or is of an unknown format.</source>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>                          </source>
-        <translation type="unfinished"></translation>
+        <translation>@YY@/@MM@/@DD@</translation>
     </message>
 </context>
 <context>
@@ -217,7 +213,7 @@ or is of an unknown format.</source>
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Obrazek </translation>
     </message>
     <message>
         <source>Initialization Error</source>
diff --git a/i18n/pl/libbatteryapplet.ts b/i18n/pl/libbatteryapplet.ts
index 3686a7a..9b8044f 100644
--- a/i18n/pl/libbatteryapplet.ts
+++ b/i18n/pl/libbatteryapplet.ts
@@ -79,7 +79,19 @@
     </message>
     <message>
         <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
+        <translation>Wklad z bateria nie jest wlozony</translation>
+    </message>
+    <message>
+        <source>no data</source>
+        <translation>brak danych</translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation>Ipaq</translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation>Wklad</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libflat.ts b/i18n/pl/libflat.ts
index 8406d92..819e462 100644
--- a/i18n/pl/libflat.ts
+++ b/i18n/pl/libflat.ts
@@ -3,7 +3,7 @@
     <name>Decoration</name>
     <message>
         <source>Flat</source>
-        <translation type="unfinished"></translation>
+        <translation>Flat</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libflatstyle.ts b/i18n/pl/libflatstyle.ts
index 25a952a..e90c11c 100644
--- a/i18n/pl/libflatstyle.ts
+++ b/i18n/pl/libflatstyle.ts
@@ -4,7 +4,7 @@
     <message>
         <source>Flat</source>
         <comment>Name of the style Flat</comment>
-        <translation type="unfinished"></translation>
+        <translation>Flat</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libhomeapplet.ts b/i18n/pl/libhomeapplet.ts
index 818c609..ebbc59a 100644
--- a/i18n/pl/libhomeapplet.ts
+++ b/i18n/pl/libhomeapplet.ts
@@ -3,11 +3,11 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrot Dom</translation>
     </message>
     <message>
         <source>Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Pulpit</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libinterfaces.ts b/i18n/pl/libinterfaces.ts
index 560568f..c0c930c 100644
--- a/i18n/pl/libinterfaces.ts
+++ b/i18n/pl/libinterfaces.ts
@@ -35,11 +35,11 @@
     </message>
     <message>
         <source>Lease Expires</source>
-        <translation type="unfinished"></translation>
+        <translation>Dzierzawa Wygasla</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzyskana Dzierzawa</translation>
     </message>
     <message>
         <source>Broadcast</source>
@@ -106,7 +106,7 @@
     </message>
     <message>
         <source>be &amp;silent</source>
-        <translation type="unfinished"></translation>
+        <translation>badz &amp;cicho</translation>
     </message>
 </context>
 <context>
@@ -149,7 +149,7 @@
     </message>
     <message>
         <source>255.255.255.0</source>
-        <translation type="unfinished">255.255.255.0</translation>
+        <translation>255.255.255.0</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pl/libkppp.ts b/i18n/pl/libkppp.ts
index b184b3f..0d6a7d9 100644
--- a/i18n/pl/libkppp.ts
+++ b/i18n/pl/libkppp.ts
@@ -3,121 +3,128 @@
     <name>AccountWidget</name>
     <message>
         <source>Allows you to modify the selected account</source>
-        <translation type="unfinished"></translation>
+        <translation>Pozwala na modyfikacje wybranego konta</translation>
     </message>
     <message>
         <source>Create a new dialup connection
 to the Internet</source>
-        <translation type="unfinished"></translation>
+        <translation>Tworz nowe polaczenie dial-up
+z internetem</translation>
     </message>
     <message>
         <source>Makes a copy of the selected account. All
 settings of the selected account are copied
 to a new account, that you can modify to fit your
 needs</source>
-        <translation type="unfinished"></translation>
+        <translation>Tworzy kopie wybranego konta. Wszystkie
+ustawienia wybranego konta sa kopiowane do
+nowego konta, ktore mozesz zmodyfikowac by 
+spelnialo twoje wymagania</translation>
     </message>
     <message>
         <source>&lt;p&gt;Deletes the selected account
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Usuwa wybrane konto
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Uzywaj ostroznie!&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
         <source>No account selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie zostalo wybrane zadne konto.</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the account &quot;%1&quot;?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno chcesz usunac
+konto &quot;%1&quot;?</translation>
     </message>
     <message>
         <source>Confirm</source>
-        <translation type="unfinished"></translation>
+        <translation>Potwierdz</translation>
     </message>
     <message>
         <source>New Account</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowe Konto</translation>
     </message>
     <message>
         <source>Edit Account: </source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj Konto:</translation>
     </message>
     <message>
         <source>Dial</source>
-        <translation type="unfinished"></translation>
+        <translation>Polacz</translation>
     </message>
     <message>
         <source>Edit Login Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj skrypt logujacy</translation>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"></translation>
+        <translation>Autentykacja</translation>
     </message>
     <message>
         <source>IP Setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia IP</translation>
     </message>
     <message>
         <source>IP</source>
-        <translation type="unfinished"></translation>
+        <translation>IP</translation>
     </message>
     <message>
         <source>Gateway Setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia Bramki</translation>
     </message>
     <message>
         <source>Gateway</source>
-        <translation type="unfinished"></translation>
+        <translation>Bramka</translation>
     </message>
     <message>
         <source>DNS Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer DNS</translation>
     </message>
     <message>
         <source>DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>DNS</translation>
     </message>
     <message>
         <source>Execute Programs</source>
-        <translation type="unfinished"></translation>
+        <translation>Uruchom Programy</translation>
     </message>
     <message>
         <source>Execute</source>
-        <translation type="unfinished"></translation>
+        <translation>Uruchom</translation>
     </message>
     <message>
         <source>You must enter a unique account name</source>
-        <translation type="unfinished"></translation>
+        <translation>Musisz podac unikalna nazwe konta</translation>
     </message>
 </context>
 <context>
     <name>AuthWidget</name>
     <message>
         <source>Authentication: </source>
-        <translation type="unfinished"></translation>
+        <translation>Autentykacja:</translation>
     </message>
     <message>
         <source>Script-based</source>
-        <translation type="unfinished"></translation>
+        <translation>Skryptowa</translation>
     </message>
     <message>
         <source>PAP</source>
-        <translation type="unfinished"></translation>
+        <translation>PAP</translation>
     </message>
     <message>
         <source>Terminal-based</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminalowa</translation>
     </message>
     <message>
         <source>CHAP</source>
-        <translation type="unfinished"></translation>
+        <translation>CHAP</translation>
     </message>
     <message>
         <source>PAP/CHAP</source>
-        <translation type="unfinished"></translation>
+        <translation>PAP/CHAP</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the method used to identify yourself to
@@ -129,27 +136,35 @@ unsure, contact your ISP.
 If you can choose between PAP and CHAP,
 choose CHAP, because it&apos;s much safer. If you don&apos;t know
 whether PAP or CHAP is right, choose PAP/CHAP.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Definiuje metode identyfikacji twojej osoby na
+serwerze PPP. Wiekszosc uniwersytetow uzywa autentykacji
+&lt;b&gt;Terminalowej&lt;/b&gt; lub &lt;b&gt; Skryptowej&lt;/b&gt;, podczas gdy
+wiekszosc firm ISP uzywa &lt;b&gt;PAP&lt;/b&gt; i/lub &lt;b&gt;CHAP&lt;/b&gt;. Jesli
+masz watpliwosci, skontaktuj sie ze swoim ISP.
+
+Jesli mozesz wybrac pomiedzy PAP i CHAP, wybierz 
+CHAP, gdyz jest duzo bezpieczniejsza. Jesli nie wiesz czy
+prawidlowa jest PAP czy CHAP, wybierz PAP/CHAP.</translation>
     </message>
     <message>
         <source>Username: </source>
-        <translation type="unfinished"></translation>
+        <translation>Uzytkownik:</translation>
     </message>
     <message>
         <source>Enter your username here...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu swoja nazwe uzytkownika...</translation>
     </message>
     <message>
         <source>Password: </source>
-        <translation type="unfinished"></translation>
+        <translation>Haslo:</translation>
     </message>
     <message>
         <source>Enter your password here</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu swoje haslo</translation>
     </message>
     <message>
         <source>Store password</source>
-        <translation type="unfinished"></translation>
+        <translation>Przechowuj haslo</translation>
     </message>
     <message>
         <source>&lt;p&gt;When this is turned on, your ISP password
@@ -160,41 +175,48 @@ you do not need to type it in every time.
 plain text in the config file, which is
 readable only to you. Make sure nobody
 gains access to this file!</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Gdy ta opcja jest wlaczona, twoje haslo
+jest zapisywane w pliku konfiguracyjnym &lt;i&gt;kppp&lt;/i&gt;,
+zebys nie musial go podawac za kazdym razem.
+
+&lt;b&gt;&lt;font color=&quot;red&quot;&gt;Ostrzezenie:&lt;/font&gt; twoje haslo bedzie przechowywane
+jako czysty tekst w pliku konfiguracyjnym czytelnym
+tylko dla ciebie. Upewnij sie, ze nikt inny
+nie ma dostepu do tego pliku!</translation>
     </message>
     <message>
         <source>error</source>
-        <translation type="unfinished"></translation>
+        <translation>blad</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Login script has unbalanced loop Start/End&lt;qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Skrypt logujacy zawiera niezbalansowana petle Start/End&lt;qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>ChooserWidget</name>
     <message>
         <source>&amp;Edit...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Edycja...</translation>
     </message>
     <message>
         <source>&amp;New...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nowe...</translation>
     </message>
     <message>
         <source>Co&amp;py</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kopiuj</translation>
     </message>
     <message>
         <source>De&amp;lete</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Usun</translation>
     </message>
 </context>
 <context>
     <name>DNSWidget</name>
     <message>
         <source>Domain name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa domeny:</translation>
     </message>
     <message>
         <source>If you enter a domain name here, this domain
@@ -205,23 +227,30 @@ restored.
 
 If you leave this field blank, no changes are
 made to the domain name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jesli wpiszesz tu nazwe domeny bedzie ona
+uzywana jako nazwa twojego komputera w trakcie
+polaczenia. Po zamknieciu polaczenia oryginalna
+nazwa domeny twojego komputera zostanie
+przywrocona.
+
+Jesli zostawisz to pole puste, nazwa domeny
+pozostanie niezmieniona.</translation>
     </message>
     <message>
         <source>Configuration:</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguracja:</translation>
     </message>
     <message>
         <source>Automatic</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatyczna</translation>
     </message>
     <message>
         <source>Manual</source>
-        <translation type="unfinished"></translation>
+        <translation>Reczna</translation>
     </message>
     <message>
         <source>DNS IP address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres IP DNS:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify a new DNS server to be
@@ -231,40 +260,51 @@ removed again.
 
 To add a DNS server, type in the IP address of
 the DNS server here and click on &lt;b&gt;Add&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Pozwala na wyznaczenie nowego serwera DNS,
+ktory bedzie uzywany w trakcie polaczenia. Po 
+zakonczeniu polaczenia wpis DNS zostanie z powrotem
+usuniety.
+
+By dodac serwer DNS wpisz jego adres IP
+i kliknij &lt;b&gt;Dodaj&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj</translation>
     </message>
     <message>
         <source>Click this button to add the DNS server
 specified in the field above. The entry
 will then be added to the list below</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij ten przycisk zeby dodac serwer DNS
+podany w powyzszym polu. Wpis zostanie
+dodany do listy ponizej</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Click this button to remove the selected DNS
 server entry from the list below</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij ten przycisk zeby usunac wybrany serwer
+DNS z listy ponizej</translation>
     </message>
     <message>
         <source>DNS address list:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista adresow DNS:</translation>
     </message>
     <message>
         <source>&lt;p&gt;This shows all defined DNS servers to use
 while you are connected. Use the &lt;b&gt;Add&lt;/b&gt; and
 &lt;b&gt;Remove&lt;/b&gt; buttons to modify the list</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Tu pokazane sa wszystkie zdefiniowane serwery DNS
+uzywane w trakcie polaczenia. Uzyj przyciskow &lt;b&gt;Dodaj&lt;/b&gt;
+i &lt;b&gt;Usun&lt;/b&gt; by zmodyfikowac ta liste</translation>
     </message>
     <message>
         <source>Disable DNS servers during connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Wylacz serwery DNS w trakcie polaczenia</translation>
     </message>
     <message>
         <source>&lt;p&gt;When this option is selected, all DNS
@@ -276,87 +316,101 @@ closed, the servers will be re-enabled
 Typically, there is no reason to use this
 option, but it may become useful under 
 some circumstances.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Gdy ta opcja jest wlaczona wszystkie serwery
+DNS wpisane do &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; sa
+chwilowo wylaczane gdy nawiazane zostanie polaczenie
+dial-up. Po zamknieciu polaczenia serwery
+zostana ponownie wlaczone.
+
+Z reguly nie ma powodow by uzywac tej
+opcji, ale w pewnych okolicznosciach moze ona
+byc przydatna.</translation>
     </message>
 </context>
 <context>
     <name>DevicesWidget</name>
     <message>
         <source>No devices selected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zadne urzadzenie nie zostalo wybrane.</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the device &quot;%1&quot;?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno chcesz usunac
+urzadzenie &quot;%1&quot;?</translation>
     </message>
     <message>
         <source>Confirm</source>
-        <translation type="unfinished"></translation>
+        <translation>Potwierdz</translation>
     </message>
     <message>
         <source>New Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowe Urzadzenie</translation>
     </message>
     <message>
         <source>Edit Device: </source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj Urzadzenie:</translation>
     </message>
     <message>
         <source>&amp;Device</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Urzadzenie</translation>
     </message>
     <message>
         <source>&amp;Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Modem</translation>
     </message>
     <message>
         <source>Allows you to modify the selected device</source>
-        <translation type="unfinished"></translation>
+        <translation>Pozwala na modyfikacje wybranego urzadzenia</translation>
     </message>
     <message>
         <source>Create a new device</source>
-        <translation type="unfinished"></translation>
+        <translation>Tworz nowe urzadzenie</translation>
     </message>
     <message>
         <source>Makes a copy of the selected device. All
 settings of the selected device are copied
 to a new device, that you can modify to fit your
 needs</source>
-        <translation type="unfinished"></translation>
+        <translation>Tworzy kopie wybranego urzadzenia. Wszystkie
+ustawienia wybranego urzadzenie sa kopiowane
+do nowego urzadzenia, ktore mozesz modyfikowac
+zgodnie ze swoimi potrzebami</translation>
     </message>
     <message>
         <source>&lt;p&gt;Deletes the selected device
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Usuwa wybrane urzadzenie
+
+&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Uzywaj ostroznie!&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
         <source>You must enter a unique device name</source>
-        <translation type="unfinished"></translation>
+        <translation>Musisz podac unikalna nazwe urzadzenia</translation>
     </message>
 </context>
 <context>
     <name>DialWidget</name>
     <message>
         <source>Connection name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa polaczenia:</translation>
     </message>
     <message>
         <source>Type in a unique name for this connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz unikalna nazwe dla tego polaczenia</translation>
     </message>
     <message>
         <source>Phone number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Numer telefonu:</translation>
     </message>
     <message>
         <source>&amp;Add...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dodaj...</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Usun</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies the phone numbers to dial. You
@@ -367,22 +421,29 @@ arrow buttons.
 
 When a number is busy or fails, &lt;i&gt;kppp&lt;/i&gt; will 
 try the next number and so on</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Definiuje numery telefonow do polaczen. Mozesz
+tu podac kilka numerow po prostu klikajac &quot;Dodaj&quot;.
+Mozesz zmienic kolejnosc, w jakiej sa podejmowane 
+proby polaczen z numerami przy pomocy przyciskow
+ze strzalkami.
+
+Jesli numer jest zajety lub nie udaje sie z nim polaczyc
+&lt;i&gt;kppp&lt;/i&gt; probuje nastepnego i tak dalej</translation>
     </message>
     <message>
         <source>Customize pppd Arguments...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawiaj agrumenty pppd...</translation>
     </message>
 </context>
 <context>
     <name>ExecWidget</name>
     <message>
         <source>Here you can select commands to run at certain stages of the connection. The commands are run with your real user id, so you cannot run any commands here requiring root permissions (unless, of course, you are root).&lt;br&gt;&lt;br&gt;Be sure to supply the whole path to the program otherwise we might be unable to find it.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tu mozesz wybrac polecenia do uruchamiania w penych etapach polaczenia. Polecenia sa wykonywane z twoim prawdziwym id uzytkownika, wiec nie mozesz uzywac polecen wymagajacych uprawnien root&apos;a (chyba, ze je posiadasz).&lt;br&gt;&lt;br&gt;Podawaj pelna sciezke do programu, gdyz w przeciwnym przypadku moze on zostac nieznaleziony.</translation>
     </message>
     <message>
         <source>Before connect:</source>
-        <translation type="unfinished"></translation>
+        <translation>Przed polaczeniem:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
@@ -391,11 +452,16 @@ dialing has begun.
 
 This might be useful, e.g. to stop HylaFAX blocking the
 modem.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pozwala na uruchomienie programu &lt;b&gt;zanim&lt;/b&gt; polaczenie
+zostanie nawiazane. Jest on uruchamiany tuz przed
+rozpoczeciem laczenia.
+
+Moze to byc przydatne np. do zatrzymania HylaFAX blokujacego
+modem.</translation>
     </message>
     <message>
         <source>Upon connect:</source>
-        <translation type="unfinished"></translation>
+        <translation>Po polaczeniu:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
@@ -403,37 +469,44 @@ is established. When your program is called, all
 preparations for an Internet connection are finished.
 
 Very useful for fetching mail and news</source>
-        <translation type="unfinished"></translation>
+        <translation>Pozwala na uruchomienie programu &lt;b&gt;po&lt;/b&gt; nawiazaniu
+polaczenia. Gdy program jest uruchamiany wszystkie
+przygotowania polaczenia internetowego sa zakonczone.
+
+Bardzo przydatne do sciagania poczty</translation>
     </message>
     <message>
         <source>Before disconnect:</source>
-        <translation type="unfinished"></translation>
+        <translation>Przed rozlaczeniem:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;before&lt;/b&gt; a connection
 is closed. The connection will stay open until
 the program exits.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pozwala na uruchomienie programu &lt;b&gt;przed&lt;/b&gt; zamknieciem
+polaczenia. Polaczenie zostanie otwarte az do zakonczenia
+programu.</translation>
     </message>
     <message>
         <source>Upon disconnect:</source>
-        <translation type="unfinished"></translation>
+        <translation>Po rozlaczeniu:</translation>
     </message>
     <message>
         <source>Allows you to run a program &lt;b&gt;after&lt;/b&gt; a connection
 has been closed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pozwala na uruchomienie programu &lt;b&gt;po&lt;/b&gt; zamknieciu
+polaczenia.</translation>
     </message>
 </context>
 <context>
     <name>GatewayWidget</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguracja</translation>
     </message>
     <message>
         <source>Default gateway</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslna bramka</translation>
     </message>
     <message>
         <source>This makes the PPP peer computer (the computer
@@ -444,24 +517,32 @@ computer, which will route these packets.
 
 This is the default for most ISPs, so you should
 probably leave this option on.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta opcja sprawia, ze komputer, do ktorego jestes
+podlaczony przez modem staje sie brama. Twoj
+komputer przesle do niego wszystkie pakiety nie skierowane
+do sieci lokalnej, a z tamdad beda one kierowane
+dalej.
+
+Jest to domyslne zachowanie dla wiekszosci ISP, wiec
+prawdopodobnie zostawic ta opcje wlaczona.</translation>
     </message>
     <message>
         <source>Static gateway</source>
-        <translation type="unfinished"></translation>
+        <translation>Bramka statyczna</translation>
     </message>
     <message>
         <source>&lt;p&gt;Allows you to specify which computer you want
 to use as gateway (see &lt;i&gt;Default Gateway&lt;/i&gt; above)</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Pozwala na okreslenie ktorego komputera chcesz
+uzywac jako bramki (patrz &lt;i&gt;Domyslna bramka&lt;/i&gt; powyzej)</translation>
     </message>
     <message>
         <source>Gateway IP address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres IP bramki:</translation>
     </message>
     <message>
         <source>Assign the default route to this gateway</source>
-        <translation type="unfinished"></translation>
+        <translation>Przypisz domyslna trase do tej bramki</translation>
     </message>
     <message>
         <source>If this option is enabled, all packets not
@@ -469,18 +550,22 @@ going to the local net are routed through
 the PPP connection.
 
 Normally, you should turn this on</source>
-        <translation type="unfinished"></translation>
+        <translation>Jesli ta opcja jest wlaczona wszystkie pakiety
+nie zmierzajace do sieci lokalnej sa kierowane
+przez polaczenie PPP.
+
+Normalnie powinienes wlaczyc ta opcje</translation>
     </message>
 </context>
 <context>
     <name>IPWidget</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguracja</translation>
     </message>
     <message>
         <source>Dynamic IP address</source>
-        <translation type="unfinished"></translation>
+        <translation>Dynamiczny adres IP</translation>
     </message>
     <message>
         <source>Select this option when your computer gets an
@@ -489,11 +574,16 @@ connection is made.
 
 Almost every Internet Service Provider uses
 this method, so this should be turned on.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz ta opcje jesli twoj komputer otrzymuje
+adres internetowy (IP) za kazdym razem gdy
+nawiazywane jest polaczenie.
+
+Prawie kazdy Dostawca Uslug Internetowych (ISP) uzywa
+tej metody, wiec opcja ta powinna byc wlaczona.</translation>
     </message>
     <message>
         <source>Static IP address</source>
-        <translation type="unfinished"></translation>
+        <translation>Statyczny adres IP</translation>
     </message>
     <message>
         <source>Select this option when your computer has a
@@ -501,20 +591,24 @@ fixed internet address (IP). Most computers
 don&apos;t have this, so you should probably select
 dynamic IP addressing unless you know what you
 are doing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz ta opcje jesli twoj komputer ma staly
+adres internetowy (IP). Wiekszosci komputerow to
+nie dotyczy, wiec prawdopodobnie powinienes wybrac
+dynamiczny adres IP, chyba ze wiesz co robisz.</translation>
     </message>
     <message>
         <source>IP address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres IP:</translation>
     </message>
     <message>
         <source>If your computer has a permanent internet
 address, you must supply your IP address here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jesli twoj komputer ma staly dostep do internetu
+musisz tu podac swoj adres IP.</translation>
     </message>
     <message>
         <source>Subnet mask:</source>
-        <translation type="unfinished"></translation>
+        <translation>Maska podsieci:</translation>
     </message>
     <message>
         <source>&lt;p&gt;If your computer has a static Internet address,
@@ -523,11 +617,17 @@ all cases this netmask will be &lt;b&gt;255.255.255.0&lt;/b&gt;,
 but your mileage may vary.
 
 If unsure, contact your Internet Service Provider</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Jesli twoj komputer ma statyczny dostep do internetu
+musisz tu podac maske sieci. W prawie wszystkich
+przypadkach maska to &lt;b&gt;255.255.255.0&lt;/b&gt;, ale
+zakres moze sie roznic.
+
+Jesli nie jestes pewien, skontaktuj sie z Dostawca Uslug Internetowych (ISP)
+</translation>
     </message>
     <message>
         <source>Auto-configure hostname from this IP</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatycznie ustaw nazwe hosta z tego IP</translation>
     </message>
     <message>
         <source>&lt;p&gt;Whenever you connect, this reconfigures
@@ -538,50 +638,59 @@ on this information, but it can also cause several
 &lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problems&lt;/a&gt;.
 
 Don&apos;t enable this unless you really need it.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Zawsze przy laczeniu opcja ta rekonfiguruje
+nazwe hosta tak by pasowala do adresu IP otrzymanego
+z serwera PPP. Moze to byc uzyteczne jesli
+uzywasz protokolu polegajacego na tej informacji,
+ale moze takze spowodowac szereg 
+&lt;a href=&quot;kppp-7.html#autohostname&quot;&gt;problemow&lt;/a&gt;.
+
+Nie wlaczaj tego jesli nie musisz.</translation>
     </message>
     <message>
         <source>Selecting this option might cause some weird problems with the X-server and applications while kppp is connected. Don&apos;t use it until you know what you are doing!
 For more information take a look at the handbook (or help) in the section &quot;Frequently asked questions&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wlaczenie tej opcji moze spowodowac problemy z X-serwerem i aplikacjami w trakcie polaczenia kppp. Nie uzywaj jej jesli nie jestes pewien, ze wiesz co robisz!
+Po wiecej informacji zajrzyj do instrukcji (lub pomocy) do sekcji &quot;FAQ&quot;.</translation>
     </message>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Ostrzezenie</translation>
     </message>
 </context>
 <context>
     <name>InterfacePPP</name>
     <message>
         <source>No password</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak hasla</translation>
     </message>
     <message>
         <source>Username defined but no password
  Please enter a password</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzytkownik zdefiniowany ale brak hasla
+Podaj haslo</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
 </context>
 <context>
     <name>ModemTransfer</name>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
 </context>
 <context>
     <name>ModemWidget</name>
     <message>
         <source>Modem &amp;name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa &amp;modemu:</translation>
     </message>
     <message>
         <source>Modem de&amp;vice:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa &amp;urzadzenia:</translation>
     </message>
     <message>
         <source>This specifies the serial port your modem is attached 
@@ -591,23 +700,29 @@ to. On Linux/x86, typically this is either /dev/ttyS0
 If you have an internal ISDN card with AT command
 emulation (most cards under Linux support this), you
 should select one of the /dev/ttyIx devices.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tu zdefiniowany jest port, do ktorego podlaczony jest
+twoj modem. Dla Linux/x86 zwykle jest to /dev/ttyS0
+(COM1 pod DOS) lub /dev/ttyS1 (COM2 pod DOS).
+
+Jesli masz wewnetrzna karte ISDN z emulacja
+komendy AT (wiekszosc kart pod Linuksem), powinienes
+wybrac jedno z urzadzen /dev/ttylx.</translation>
     </message>
     <message>
         <source>&amp;Flow control:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontrola &amp;przeplywu:</translation>
     </message>
     <message>
         <source>Hardware [CRTSCTS]</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprzet [CRTSCTS]</translation>
     </message>
     <message>
         <source>Software [XON/XOFF]</source>
-        <translation type="unfinished"></translation>
+        <translation>Oprogramowanie [XON/XOFF]</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how the serial port and modem
@@ -615,11 +730,15 @@ communicate. You should not change this unless
 you know what you are doing.
 
 &lt;b&gt;Default&lt;/b&gt;: CRTSCTS</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Specyfikuje sposob komunikacji pomiedzy portem
+szeregowym a modemem. Nie powinienes tego zmieniac
+jesli nie jestes pewien, ze wiesz co robisz.
+
+&lt;b&gt;Domyslnie&lt;/b&gt;: CRTSCTS</translation>
     </message>
     <message>
         <source>&amp;Line termination:</source>
-        <translation type="unfinished"></translation>
+        <translation>Koniec &amp;linii:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Specifies how AT commands are sent to your
@@ -629,11 +748,17 @@ to the init string, you should try different
 settings here
 
 &lt;b&gt;Default&lt;/b&gt;: CR/LF</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Specyfikuje jak wysylane sa do modemu komendy
+AT. Wiekszosc modemow bedzie dobrze pracowac z 
+domyslnym &lt;i&gt;CR/LF&lt;/i&gt;. Jesli twoj modem nie reaguje
+na lancuch inicjujacy powinienes sprobuwac innych
+ustawien
+
+&lt;b&gt;Domyslnie&lt;/b&gt;: CR/LF</translation>
     </message>
     <message>
         <source>Co&amp;nnection speed:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Szybkosc polaczenia:</translation>
     </message>
     <message>
         <source>Specifies the speed your modem and the serial
@@ -642,11 +767,16 @@ the default of 38400 bits/sec. If everything
 works you can try to increase this value, but to
 no more than 115200 bits/sec (unless you know
 that your serial port supports higher speeds).</source>
-        <translation type="unfinished"></translation>
+        <translation>Specyfikuje szybkosc komunikacji pomiedzy
+portem szeregowym a modemem. Powinienes zaczac
+od domyslnych 38400 bitow/sek. Jesli wszystko
+jest dobrze mozesz probowac podniesc ta wartosc
+ale nie wyzej niz 115200 bitow/sek (chyba ze jestes
+pewien, ze twoj port szeregowy obsluguje wyzsze szybkosci).</translation>
     </message>
     <message>
         <source>&amp;Use lock file</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Uzywaj pliku blokady</translation>
     </message>
     <message>
         <source>&lt;p&gt;To prevent other programs from accessing the
@@ -658,32 +788,41 @@ Here you can select whether this locking will
 be done.
 
 &lt;b&gt;Default&lt;/b&gt;: On</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;By zapobiec uzywaniu modemu przez
+inne programy w trakcie polaczenia moze
+zostac utworzony plik, ktory swiadczy o uzywaniu
+modemu. Dla Linuksa moglby to byc 
+&lt;tt&gt;/var/lock/LCK..ttyS1&lt;/tt&gt;
+Tu mozesz zdecydowac, czy plik taki ma byc uzywany.
+
+&lt;b&gt;Domyslnie&lt;/b&gt;: Tak</translation>
     </message>
     <message>
         <source>Modem timeout:</source>
-        <translation type="unfinished"></translation>
+        <translation>Limit czasowy modemu:</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"></translation>
+        <translation>sek</translation>
     </message>
     <message>
         <source>This specifies how long &lt;i&gt;kppp&lt;/i&gt; waits for a
 &lt;i&gt;CONNECT&lt;/i&gt; response from your modem. The
 recommended value is 30 seconds.</source>
-        <translation type="unfinished"></translation>
+        <translation>Definiuje jak dlugo &lt;i&gt;kppp&lt;/i&gt; czeka na 
+odpowiedz &lt;i&gt;CONNECT&lt;/i&gt; z modemu. Rekomendowana
+wartosc to 30 sekund.</translation>
     </message>
 </context>
 <context>
     <name>ModemWidget2</name>
     <message>
         <source>Busy wait:</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktywne oczekiwanie:</translation>
     </message>
     <message>
         <source>&amp;Wait for dial tone before dialing</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Czekaj na dzwiek polaczenia przed laczeniem</translation>
     </message>
     <message>
         <source>&lt;p&gt;Normally the modem waits for a dial tone
@@ -693,11 +832,17 @@ recognize this sound, or your local phone system
 does not emit such a tone, uncheck this option
 
 &lt;b&gt;Default:&lt;/b&gt;: On</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Normalnie modem czeka na sygnal polaczenia
+z linii telefonicznej oznaczajacy, ze mozna zaczac
+wybieranie numeru. Jesli twoj modem nie rozpoznaje
+tego sygnalu albo twoj system telefoniczny go nie
+emituje, wylacz ta opcje.
+
+&lt;b&gt;Domyslnie&lt;/b&gt;: Tak</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"></translation>
+        <translation>sek</translation>
     </message>
     <message>
         <source>Specifies the number of seconds to wait before
@@ -707,11 +852,17 @@ same number is busy too often.
 
 The default is 0 seconds, you should not change
 this unless you need to.</source>
-        <translation type="unfinished"></translation>
+        <translation>Definiuje liczbe sekund do odczekania przed
+ponowna proba polaczenia jesli wszystkie numery sa
+zajete. Jest to konieczne gdyz niektore modemy
+blokuja sie jesli ten sam numer jest czesto zajety.
+
+Domyslna wartosc to 0 sekund, jesli nie musisz, to
+nie powinienes tego zmieniac.</translation>
     </message>
     <message>
         <source>Modem &amp;volume:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Glosnosc modemu:</translation>
     </message>
     <message>
         <source>Most modems have a speaker which makes
@@ -721,11 +872,16 @@ lower volume.
 
 If this does not work for your modem,
 you must modify the modem volume command.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiekszosc modemow posiada glosniki robiace
+podczas wybierania numeru duzo halasu. Tutaj
+mozesz taki glosnik wylaczyc albo sciszyc.
+
+Jesli to nie dziala dla twojego modemu musisz
+zmienic komende glosnosci modemu.</translation>
     </message>
     <message>
         <source>Modem asserts CD line</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem zapewnia linie CD</translation>
     </message>
     <message>
         <source>This controls how &lt;i&gt;kppp&lt;/i&gt; detects that the modem
@@ -733,20 +889,25 @@ is not responding. Unless you are having
 problems with this, do not modify this setting.
 
 &lt;b&gt;Default&lt;/b&gt;: Off</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta opcja kontroluje sposob w jaki &lt;i&gt;kppp&lt;/i&gt; wykrywa,
+ze modem nie odpowiada. Jesli nie masz z tym problemow
+nie modyfikuj tych ustawien.
+
+&lt;b&gt;Domyslnie&lt;/b&gt;: Nie</translation>
     </message>
     <message>
         <source>Mod&amp;em Commands...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Polecenia modemu...</translation>
     </message>
     <message>
         <source>Allows you to change the AT command for
 your modem.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pozwala na zmiane polecen AT dla twojego
+modemu.</translation>
     </message>
     <message>
         <source>&amp;Query Modem...</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Odpytuj modem...</translation>
     </message>
     <message>
         <source>Most modems support the ATI command set to
@@ -755,509 +916,521 @@ find out vendor and revision of your modem.
 Press this button to query your modem for
 this information. It can be useful to help
 you setup the modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiekszosc modemow obsluguje polecenie ATI sluzace
+do odczytania producenta i wersji modemu.
+
+Wcisnij ten przycisk aby odpytac modem o te
+informacje. Moze to pomoc w konfiguracji
+modemu</translation>
     </message>
 </context>
 <context>
     <name>PPPConfigWidget</name>
     <message>
         <source>Configure Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguruj Modem</translation>
     </message>
     <message>
         <source>Modem failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Porazka Modemu</translation>
     </message>
     <message>
         <source>A critical failure appeard while testing the modem</source>
-        <translation type="unfinished"></translation>
+        <translation>W trakcie testowania modemu wydazyla sie krytyczna porazka</translation>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Konta</translation>
     </message>
     <message>
         <source>&amp;Devices</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Urzadzenia</translation>
     </message>
 </context>
 <context>
     <name>PPPdArguments</name>
     <message>
         <source>Customize pppd Arguments</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw argumenty pppd</translation>
     </message>
     <message>
         <source>Argument:</source>
-        <translation type="unfinished"></translation>
+        <translation>Argument:</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslne</translation>
     </message>
 </context>
 <context>
     <name>PhoneNumberDialog</name>
     <message>
         <source>Add Phone Number</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj numer telefonu</translation>
     </message>
     <message>
         <source>Enter a phone number:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz numer telefonu:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>PPP</source>
-        <translation type="unfinished"></translation>
+        <translation>PPP</translation>
     </message>
     <message>
         <source>generic ppp device</source>
-        <translation type="unfinished"></translation>
+        <translation>ogolne urzadzenie ppp</translation>
     </message>
     <message>
         <source>Unable to open modem.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna otworzyc modemu.</translation>
     </message>
     <message>
         <source>Unable to detect state of CD line.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna wykryc stanu linii CD.</translation>
     </message>
     <message>
         <source>The modem is not ready.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem nie jest gotowy.</translation>
     </message>
     <message>
         <source>The modem is busy.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem jest zajety.</translation>
     </message>
     <message>
         <source>Modem Ready.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem gotowy.</translation>
     </message>
     <message>
         <source>Can&apos;t restore tty settings: tcsetattr()
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna przywrocic ustawien tty: tcsetattr()
+</translation>
     </message>
     <message>
         <source>The modem does not respond.</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem nie odpowiada.</translation>
     </message>
     <message>
         <source>Unknown speed</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieznana szybkosc</translation>
     </message>
     <message>
         <source>ATI Query</source>
-        <translation type="unfinished"></translation>
+        <translation>Pytanie ATI</translation>
     </message>
     <message>
         <source>Unable to create modem lock file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna utowrzyc pliku blokady modemu.</translation>
     </message>
     <message>
         <source>Looking for modem...</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukanie modemu...</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <source>Modem Query timed out.</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpytywanie modemu przekroczylo limit czasu.</translation>
     </message>
     <message>
         <source>Modem device is locked.</source>
-        <translation type="unfinished"></translation>
+        <translation>Urzadzenie modemu zablokowane.</translation>
     </message>
     <message>
         <source>Modem Ready</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem gotowy</translation>
     </message>
     <message>
         <source>One moment please...</source>
-        <translation type="unfinished"></translation>
+        <translation>Chwileczke...</translation>
     </message>
     <message>
         <source>Modem Query Results</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyniki odpytywania modemu</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij</translation>
     </message>
     <message>
         <source>You&apos;re not allowed to dial out with kppp.
 Contact your system administrator.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie masz uprawnien do laczenia sie przez kppp.
+Skontaktuj sie z administratorem.</translation>
     </message>
     <message>
         <source>Cannot find the PPP daemon!
 Make sure that pppd is installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna znalezc demona PPP!
+Upewnij sie, ze pppd jest zainstalowany.</translation>
     </message>
     <message>
         <source>You do not have the permission to start pppd!
 Contact your system administrator and ask to get access to pppd.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie masz uprawnien by uruchomic pppd!
+Skontaktuj sie z administratorem i popros o dostep do pppd.</translation>
     </message>
     <message>
         <source>You don&apos;t have sufficient permission to run
 %1
 Please make sure that kppp is owned by root and has the SUID bit set.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie masz wystarczajacych uprawnien by uruchomic
+%1
+Upewnij sie, ze wlascicielem kppp jest root i ze ustawiony jest bit SUID.</translation>
     </message>
     <message>
         <source>%1 is missing or can&apos;t be read!
 Ask your system administrator to create this file (can be empty) with appropriate read and write permissions.</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak lub nie do odczytania %1!
+Popros administratora by stworzyl ten plik (moze byc pusty) z wlascimi uprawnieniami do odczytu i zapisu.</translation>
     </message>
     <message>
         <source>Edit Modem Commands</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj polecenia modemu</translation>
     </message>
     <message>
         <source>Pre-init delay (sec/100):</source>
-        <translation type="unfinished"></translation>
+        <translation>Opoznienie pre-inicjalizacyjne (sek/100):</translation>
     </message>
     <message>
         <source>Initialization string %1:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lancuch inicjalizacyjny %1:</translation>
     </message>
     <message>
         <source>Post-init delay (sec/100):</source>
-        <translation type="unfinished"></translation>
+        <translation>Opoznienie post-inicjalizacyjne (sek/100):</translation>
     </message>
     <message>
         <source>Dialing speed (sec/100):</source>
-        <translation type="unfinished"></translation>
+        <translation>Predkosc dzwonienia (sek/100):</translation>
     </message>
     <message>
         <source>Init response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz init:</translation>
     </message>
     <message>
         <source>No dial tone detection:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wykrycie braku sygnalu:</translation>
     </message>
     <message>
         <source>Dial string:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lancuch do dzwonienia:</translation>
     </message>
     <message>
         <source>Connect response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz polaczenia:</translation>
     </message>
     <message>
         <source>Busy response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz zajetosci:</translation>
     </message>
     <message>
         <source>No carrier response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz braku karetki:</translation>
     </message>
     <message>
         <source>No dial tone response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz braku sygnalu:</translation>
     </message>
     <message>
         <source>Hangup string:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lancuch rozlaczenia:</translation>
     </message>
     <message>
         <source>Hangup response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz rozlaczenia:</translation>
     </message>
     <message>
         <source>Answer string:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lancuch odpowiedzi:</translation>
     </message>
     <message>
         <source>Ring response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz dzwonienia:</translation>
     </message>
     <message>
         <source>Answer response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz odpowiedzi:</translation>
     </message>
     <message>
         <source>Escape string:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lancuch ucieczki:</translation>
     </message>
     <message>
         <source>Escape response:</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz ucieczki:</translation>
     </message>
     <message>
         <source>Guard time (sec/50):</source>
-        <translation type="unfinished"></translation>
+        <translation>Czas strozowania (sek/50):</translation>
     </message>
     <message>
         <source>Volume off/low/high:</source>
-        <translation type="unfinished"></translation>
+        <translation>Glosnosc wyl/niska/wysoka:</translation>
     </message>
     <message>
         <source>Connected at:</source>
-        <translation type="unfinished"></translation>
+        <translation>Polaczony z:</translation>
     </message>
     <message>
         <source>Time connected:</source>
-        <translation type="unfinished"></translation>
+        <translation>Czas polaczenia:</translation>
     </message>
     <message>
         <source>Volume:</source>
-        <translation type="unfinished"></translation>
+        <translation>Glosnosc:</translation>
     </message>
     <message>
         <source>Session Bill:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rachunek sesji:</translation>
     </message>
     <message>
         <source>Total Bill:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rachunek totalny:</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozlacz</translation>
     </message>
     <message>
         <source>Byte</source>
-        <translation type="unfinished"></translation>
+        <translation>Bit</translation>
     </message>
     <message>
         <source>KB</source>
-        <translation type="unfinished"></translation>
+        <translation>KB</translation>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation>MB</translation>
     </message>
     <message>
         <source>GB</source>
-        <translation type="unfinished"></translation>
+        <translation>GB</translation>
     </message>
     <message>
         <source>Connecting to: </source>
-        <translation type="unfinished"></translation>
+        <translation>Laczenie z:</translation>
     </message>
     <message>
         <source>Online</source>
-        <translation type="unfinished"></translation>
+        <translation>Polaczony</translation>
     </message>
     <message>
         <source>Offline</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozlaczony</translation>
     </message>
     <message>
         <source>Log</source>
-        <translation type="unfinished"></translation>
+        <translation>Log</translation>
     </message>
     <message>
         <source>Connecting to: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Laczenie z: %1</translation>
     </message>
     <message>
         <source>Running pre-startup command...</source>
-        <translation type="unfinished"></translation>
+        <translation>Uruchamianie polecenia pre-startowego...</translation>
     </message>
     <message>
         <source>Initializing modem...</source>
-        <translation type="unfinished"></translation>
+        <translation>Inicjalizacja modemu...</translation>
     </message>
     <message>
         <source>Setting </source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawianie</translation>
     </message>
     <message>
         <source>Setting speaker volume...</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawianie glosnosci glosnika...</translation>
     </message>
     <message>
         <source>Turning off dial tone waiting...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wylaczanie oczekiwania na sygnal...</translation>
     </message>
     <message>
         <source>Dialing %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybieranie %1</translation>
     </message>
     <message>
         <source>Line busy. Hanging up...</source>
-        <translation type="unfinished"></translation>
+        <translation>Linia zajeta. Rozlaczam...</translation>
     </message>
     <message>
         <source>Line busy. Waiting: %1 seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Linia zajeta. Czekam: %1 sekund</translation>
     </message>
     <message>
         <source>No Dialtone</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak sygnalu</translation>
     </message>
     <message>
         <source>No Carrier</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak karetki</translation>
     </message>
     <message>
         <source>Scanning %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Skanowanie %1</translation>
     </message>
     <message>
         <source>Saving %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapis %1</translation>
     </message>
     <message>
         <source>Sending %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysylanie %1</translation>
     </message>
     <message>
         <source>Expecting %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Oczekiwanie na %1</translation>
     </message>
     <message>
         <source>Pause %1 seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Pauza %1 sekund</translation>
     </message>
     <message>
         <source>Timeout %1 seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>Koniec czasu, %1 sekund</translation>
     </message>
     <message>
         <source>Hangup</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozlacz</translation>
     </message>
     <message>
         <source>Answer</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz</translation>
     </message>
     <message>
         <source>ID %1</source>
-        <translation type="unfinished"></translation>
+        <translation>ID %1</translation>
     </message>
     <message>
         <source>Password %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Haslo %1</translation>
     </message>
     <message>
         <source>Prompting %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zachecanie %1</translation>
     </message>
     <message>
         <source>PW Prompt %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Zacheta PW %1</translation>
     </message>
     <message>
         <source>Loop Start %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Start petli %1</translation>
     </message>
     <message>
         <source>ERROR: Nested too deep, ignored.</source>
-        <translation type="unfinished"></translation>
+        <translation>BLAD: Za glebokie zagniezdzenie, ignoruje.</translation>
     </message>
     <message>
         <source>Loops nested too deeply!</source>
-        <translation type="unfinished"></translation>
+        <translation>Petle za gleboko zagniezdzone!</translation>
     </message>
     <message>
         <source>Loop End %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Koniec petli %1</translation>
     </message>
     <message>
         <source>LoopEnd without matching Start! Line: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>LoopEnd bez odpowiadajacego Start! Linia: %1</translation>
     </message>
     <message>
         <source>Starting pppd...</source>
-        <translation type="unfinished"></translation>
+        <translation>Uruchamianie pppd...</translation>
     </message>
     <message>
         <source>Scan Var: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Skan Var: %1</translation>
     </message>
     <message>
         <source>Found: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Znaleziono: %1</translation>
     </message>
     <message>
         <source>Looping: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Skok: %1</translation>
     </message>
     <message>
         <source>Script timed out!</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrypt przekroczyl limit czasu!</translation>
     </message>
     <message>
         <source>Scanning: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Skanowanie: %1</translation>
     </message>
     <message>
         <source>Expecting: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Oczekiwanie: %1</translation>
     </message>
     <message>
         <source>Logging on to network...</source>
-        <translation type="unfinished"></translation>
+        <translation>Logowanie do sieci...</translation>
     </message>
     <message>
         <source>Running startup command...</source>
-        <translation type="unfinished"></translation>
+        <translation>Uruchamianie polecenia startowego...</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation type="unfinished"></translation>
+        <translation>Zrobione</translation>
     </message>
     <message>
         <source>pppd command + command-line arguments exceed 2024 characters in length.</source>
-        <translation type="unfinished"></translation>
+        <translation>polecenie pppd + argumenty przekroczyly dlugosc 2024 znakow.</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find the PPP daemon!&lt;br&gt;Make sure that pppd is installed and that you have entered the correct path.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Nie mozna znalezc demona PPP!&lt;br&gt;Upewnij sie, ze pppd jest zainstalowany i ze wpisales wlasciwa sciezke.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot execute:&lt;br&gt; %1&lt;br&gt;Please make sure that you have given setuid permission and that pppd is executable.&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Nie mozna wykonac:&lt;br&gt;%1&lt;br&gt;Upewnij sie, ze ustawiles uprawnienia setuid i ze pppd jest wykonywalny.&lt;br&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot find:&lt;br&gt; %1&lt;br&gt;Please make sure you have setup your modem device properly and/or adjust the location of the modem device on the modem tab of the setup dialog.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Nie mozna znalezc:&lt;br&gt; %1&lt;br&gt;Upewnij sie, ze wlasciwie skonfigurowales modem i/lub dostosuj pozycje urzadzenia modemu na zakladce modemu w oknie z ustawieniami.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Jako metode autentykacji wybrales PAP lub CHAP. W zwiazku z tym musisz podac nazwe uzytkownika i haslo!&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Nie mozna stworzyc pliku autentykacji PAP/CHAP&lt;br&gt;&quot;%1&quot;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>You must specify a telephone number!</source>
-        <translation type="unfinished"></translation>
+        <translation>Musisz podac numer telefonu!</translation>
     </message>
 </context>
 <context>
     <name>ScriptWidget</name>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj</translation>
     </message>
     <message>
         <source>Insert</source>
-        <translation type="unfinished"></translation>
+        <translation>Wstaw</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libliquid.ts b/i18n/pl/libliquid.ts
index f61f2b8..c058ddf 100644
--- a/i18n/pl/libliquid.ts
+++ b/i18n/pl/libliquid.ts
@@ -10,66 +10,66 @@
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation type="unfinished">Styl Liquid</translation>
+        <translation>Styl Liquid</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">Bez przezroczystosci</translation>
+        <translation>Bez przezroczystosci</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">Pasiasty, kolor tla</translation>
+        <translation>Pasiasty, kolor tla</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">Pasiasty, kolor przycisku</translation>
+        <translation>Pasiasty, kolor przycisku</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Przezroczysty pasiasty, kolor tla</translation>
+        <translation>Przezroczysty pasiasty, kolor tla</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">Przezroczysty pasiasty, kolor przycisku</translation>
+        <translation>Przezroczysty pasiasty, kolor przycisku</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Ustawiona przezroczystosc</translation>
+        <translation>Ustawiona przezroczystosc</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Kolor menu</translation>
+        <translation>Kolor menu</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Kolor tekstu</translation>
+        <translation>Kolor tekstu</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">Nieprzezroczystosc</translation>
+        <translation>Nieprzezroczystosc</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Uzywaj cieniowanego tekstu menu</translation>
+        <translation>Uzywaj cieniowanego tekstu menu</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Plaskie przyciski na pasku narzedzi</translation>
+        <translation>Plaskie przyciski na pasku narzedzi</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">Kontrast pasków</translation>
+        <translation>Kontrast pasków</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation type="unfinished">Liquid</translation>
+        <translation>Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished"></translation>
+        <translation>Bardzo wydajny styl Liquid autorstwa Mosfet&apos;a</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libmadplugin.ts b/i18n/pl/libmadplugin.ts
index 0182447..7e8010c 100644
--- a/i18n/pl/libmadplugin.ts
+++ b/i18n/pl/libmadplugin.ts
@@ -43,7 +43,7 @@
     </message>
     <message>
         <source>Bitrate: </source>
-        <translation type="unfinished"></translation>
+        <translation>Bitrate:</translation>
     </message>
     <message>
         <source>URL: </source>
diff --git a/i18n/pl/libopie.ts b/i18n/pl/libopie.ts
index 24385f3..e541d23 100644
--- a/i18n/pl/libopie.ts
+++ b/i18n/pl/libopie.ts
@@ -3,31 +3,31 @@
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Przycisk Kalendarz</translation>
     </message>
     <message>
         <source>Contacts Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Przycisk Kontakty</translation>
     </message>
     <message>
         <source>Menu Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Przycisk Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Przycisk Poczta</translation>
     </message>
     <message>
         <source>Home Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Przycisk Dom</translation>
     </message>
     <message>
         <source>Record Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Przycisk Zapis</translation>
     </message>
     <message>
         <source>Display Rotate</source>
-        <translation type="unfinished"></translation>
+        <translation>Obrot ekranu</translation>
     </message>
     <message>
         <source>Lower+Up</source>
@@ -78,34 +78,34 @@
     </message>
     <message>
         <source>Red:</source>
-        <translation type="unfinished"></translation>
+        <translation>Czerwien:</translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zielen:</translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation type="unfinished"></translation>
+        <translation>Blekit:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kanal alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz kolor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiecej</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiecej...</translation>
     </message>
 </context>
 <context>
@@ -116,63 +116,63 @@
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Otworz</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
-        <translation type="unfinished"></translation>
+        <translation>Duze</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Srednie</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Male</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Styl</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozmiar</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
@@ -183,79 +183,79 @@
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
-        <translation type="unfinished"></translation>
+        <translation>Zdarzenie powtarzalne</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak</translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished"></translation>
+        <translation>Dzien</translation>
     </message>
     <message>
         <source>Week</source>
-        <translation type="unfinished"></translation>
+        <translation>Tydzien</translation>
     </message>
     <message>
         <source>Month</source>
-        <translation type="unfinished"></translation>
+        <translation>Miesiac</translation>
     </message>
     <message>
         <source>Year</source>
-        <translation type="unfinished"></translation>
+        <translation>Rok</translation>
     </message>
     <message>
         <source>Every:</source>
-        <translation type="unfinished"></translation>
+        <translation>Co:</translation>
     </message>
     <message>
         <source>Frequency</source>
-        <translation type="unfinished"></translation>
+        <translation>Czestotliwosc</translation>
     </message>
     <message>
         <source>End On:</source>
-        <translation type="unfinished"></translation>
+        <translation>Koniec:</translation>
     </message>
     <message>
         <source>No End Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Bez daty koncowej</translation>
     </message>
     <message>
         <source>Repeat On</source>
-        <translation type="unfinished"></translation>
+        <translation>Powtarzaj uzywajac</translation>
     </message>
     <message>
         <source>Mon</source>
-        <translation type="unfinished"></translation>
+        <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
-        <translation type="unfinished"></translation>
+        <translation>Wto</translation>
     </message>
     <message>
         <source>Wed</source>
-        <translation type="unfinished"></translation>
+        <translation>Sro</translation>
     </message>
     <message>
         <source>Thu</source>
-        <translation type="unfinished"></translation>
+        <translation>Czw</translation>
     </message>
     <message>
         <source>Fri</source>
-        <translation type="unfinished"></translation>
+        <translation>Pia</translation>
     </message>
     <message>
         <source>Sat</source>
-        <translation type="unfinished"></translation>
+        <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Every</source>
-        <translation type="unfinished"></translation>
+        <translation>Co</translation>
     </message>
     <message>
         <source>Var1</source>
@@ -274,366 +274,367 @@
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Bez daty koncowej</translation>
     </message>
     <message>
         <source>days</source>
-        <translation type="unfinished"></translation>
+        <translation>dni</translation>
     </message>
     <message>
         <source>day</source>
-        <translation type="unfinished"></translation>
+        <translation>dzien</translation>
     </message>
     <message>
         <source>weeks</source>
-        <translation type="unfinished"></translation>
+        <translation>tygodni</translation>
     </message>
     <message>
         <source>week</source>
-        <translation type="unfinished"></translation>
+        <translation>tydzien</translation>
     </message>
     <message>
         <source>months</source>
-        <translation type="unfinished"></translation>
+        <translation>miesiecy</translation>
     </message>
     <message>
         <source>month</source>
-        <translation type="unfinished"></translation>
+        <translation>miesiac</translation>
     </message>
     <message>
         <source>years</source>
-        <translation type="unfinished"></translation>
+        <translation>lat</translation>
     </message>
     <message>
         <source>year</source>
-        <translation type="unfinished"></translation>
+        <translation>rok</translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation>i</translation>
     </message>
     <message>
         <source>,
 and </source>
-        <translation type="unfinished"></translation>
+        <translation>,
+i</translation>
     </message>
     <message>
         <source>, and </source>
-        <translation type="unfinished"></translation>
+        <translation>, i</translation>
     </message>
     <message>
         <source>No Repeat</source>
-        <translation type="unfinished"></translation>
+        <translation>Bez powtarzania</translation>
     </message>
     <message>
         <source>day(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>dzien (dni)</translation>
     </message>
     <message>
         <source>Repeat On</source>
-        <translation type="unfinished"></translation>
+        <translation>Powtarzaj uzywajac</translation>
     </message>
     <message>
         <source>Mon</source>
-        <translation type="unfinished"></translation>
+        <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
-        <translation type="unfinished"></translation>
+        <translation>Wto</translation>
     </message>
     <message>
         <source>Wed</source>
-        <translation type="unfinished"></translation>
+        <translation>Sro</translation>
     </message>
     <message>
         <source>Thu</source>
-        <translation type="unfinished"></translation>
+        <translation>Czw</translation>
     </message>
     <message>
         <source>Fri</source>
-        <translation type="unfinished"></translation>
+        <translation>Pia</translation>
     </message>
     <message>
         <source>Sat</source>
-        <translation type="unfinished"></translation>
+        <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>week(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>tydzien(nie)</translation>
     </message>
     <message>
         <source>Repeat By</source>
-        <translation type="unfinished"></translation>
+        <translation>Powtarzaj co</translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished"></translation>
+        <translation>Dzien</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Mesiac(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>rok (lata)</translation>
     </message>
     <message>
         <source>Every</source>
-        <translation type="unfinished"></translation>
+        <translation>Co</translation>
     </message>
     <message>
         <source>on </source>
-        <translation type="unfinished"></translation>
+        <translation>uzywajac</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
-        <translation type="unfinished"></translation>
+        <translation>Czas:</translation>
     </message>
     <message>
         <source>:</source>
-        <translation type="unfinished"></translation>
+        <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz czas:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
-        <translation type="unfinished"></translation>
+        <translation>Priorytet:</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation type="unfinished"></translation>
+        <translation>Postep:</translation>
     </message>
     <message>
         <source>Deadline:</source>
-        <translation type="unfinished"></translation>
+        <translation>Koniec:</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslny e-mail:</translation>
     </message>
     <message>
         <source>Office: </source>
-        <translation type="unfinished"></translation>
+        <translation>Biuro:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - WWW:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - telefon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - komorka:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
-        <translation type="unfinished"></translation>
+        <translation>Firma - pager:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
-        <translation type="unfinished"></translation>
+        <translation>Strona domowa:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
-        <translation type="unfinished"></translation>
+        <translation>Dom - telefon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
-        <translation type="unfinished"></translation>
+        <translation>Dom - fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
-        <translation type="unfinished"></translation>
+        <translation>Komorka:</translation>
     </message>
     <message>
         <source>All Emails: </source>
-        <translation type="unfinished"></translation>
+        <translation>Adery e-mail:</translation>
     </message>
     <message>
         <source>Profession: </source>
-        <translation type="unfinished"></translation>
+        <translation>Zawod:</translation>
     </message>
     <message>
         <source>Assistant: </source>
-        <translation type="unfinished"></translation>
+        <translation>Asystent:</translation>
     </message>
     <message>
         <source>Manager: </source>
-        <translation type="unfinished"></translation>
+        <translation>Menedzer:</translation>
     </message>
     <message>
         <source>Male</source>
-        <translation type="unfinished"></translation>
+        <translation>Mezczyzna</translation>
     </message>
     <message>
         <source>Female</source>
-        <translation type="unfinished"></translation>
+        <translation>Kobieta</translation>
     </message>
     <message>
         <source>Gender: </source>
-        <translation type="unfinished"></translation>
+        <translation>Plec:</translation>
     </message>
     <message>
         <source>Spouse: </source>
-        <translation type="unfinished"></translation>
+        <translation>Partner:</translation>
     </message>
     <message>
         <source>Birthday: </source>
-        <translation type="unfinished"></translation>
+        <translation>Urodziny:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
-        <translation type="unfinished"></translation>
+        <translation>Rocznica:</translation>
     </message>
     <message>
         <source>Children: </source>
-        <translation type="unfinished"></translation>
+        <translation>Dzieci:</translation>
     </message>
     <message>
         <source>Nickname: </source>
-        <translation type="unfinished"></translation>
+        <translation>Przydomek:</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation type="unfinished"></translation>
+        <translation>Notatki:</translation>
     </message>
     <message>
         <source>Start:</source>
-        <translation type="unfinished"></translation>
+        <translation>Poczatek:</translation>
     </message>
     <message>
         <source>End:</source>
-        <translation type="unfinished"></translation>
+        <translation>Koniec:</translation>
     </message>
     <message>
         <source>Note:</source>
-        <translation type="unfinished"></translation>
+        <translation>Notatka:</translation>
     </message>
     <message>
         <source>Every</source>
-        <translation type="unfinished"></translation>
+        <translation>Co</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
-        <translation type="unfinished"></translation>
+        <translation>Kazdy %1 %2</translation>
     </message>
     <message>
         <source>The %1 every </source>
-        <translation type="unfinished"></translation>
+        <translation>Kazdy %1</translation>
     </message>
     <message>
         <source>Every </source>
-        <translation type="unfinished"></translation>
+        <translation>Co</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation type="unfinished"></translation>
+        <translation>Poniedzialek</translation>
     </message>
     <message>
         <source>Tuesday</source>
-        <translation type="unfinished"></translation>
+        <translation>Wtorek</translation>
     </message>
     <message>
         <source>Wednesday</source>
-        <translation type="unfinished"></translation>
+        <translation>Sroda</translation>
     </message>
     <message>
         <source>Thursday</source>
-        <translation type="unfinished"></translation>
+        <translation>Czwartek</translation>
     </message>
     <message>
         <source>Friday</source>
-        <translation type="unfinished"></translation>
+        <translation>Piatek</translation>
     </message>
     <message>
         <source>Saturday</source>
-        <translation type="unfinished"></translation>
+        <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation type="unfinished"></translation>
+        <translation>Niedziela</translation>
     </message>
     <message>
         <source>Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Pliki</translation>
     </message>
     <message>
         <source>All Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Wszystkie pliki</translation>
     </message>
     <message>
         <source>Very high</source>
-        <translation type="unfinished"></translation>
+        <translation>Bardzo wysoki</translation>
     </message>
     <message>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysoki</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation type="unfinished"></translation>
+        <translation>Normalny</translation>
     </message>
     <message>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Niski</translation>
     </message>
     <message>
         <source>Very low</source>
-        <translation type="unfinished"></translation>
+        <translation>Bardzo niski</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokacja:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
-        <translation type="unfinished"></translation>
+        <translation>Zdarzenie calodniowe</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
-        <translation type="unfinished"></translation>
+        <translation>Zdarzenie wielodniowe</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adres firmowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2 kazdego</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pl/libopieobex.ts b/i18n/pl/libopieobex.ts
index 8fd774c..cf2ea6a 100644
--- a/i18n/pl/libopieobex.ts
+++ b/i18n/pl/libopieobex.ts
@@ -3,74 +3,74 @@
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;&lt;b&gt;Otrzymano:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
-        <translation type="unfinished"></translation>
+        <translation>Akceptuj</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation type="unfinished"></translation>
+        <translation>Odmow</translation>
     </message>
     <message>
         <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Otrzymales plik typu %1 (&lt;img src=&quot;%2&quot;&gt; )Co chcesz zrobic?</translation>
     </message>
 </context>
 <context>
     <name>OpieObex::SendWidget</name>
     <message>
         <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;&lt;h1&gt;Wysylanie:&lt;/h1&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Done</source>
-        <translation type="unfinished"></translation>
+        <translation>Gotowe</translation>
     </message>
     <message>
         <source>IrDa is not enabled!</source>
-        <translation type="unfinished"></translation>
+        <translation>IrDa nie jest wlaczona!</translation>
     </message>
     <message>
         <source>Searching for IrDa Devices.</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukanie urzadzen IrDa.</translation>
     </message>
     <message>
         <source>Bluetooth is not available</source>
-        <translation type="unfinished"></translation>
+        <translation>Bluetooth niedostepny</translation>
     </message>
     <message>
         <source>Searching for bluetooth Devices.</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukanie urzadzen bluetooth.</translation>
     </message>
     <message>
         <source>Scheduling for beam.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wstawianie do emisji.</translation>
     </message>
     <message>
         <source>Click to beam</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij by emitowc</translation>
     </message>
     <message>
         <source>Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyslany</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Porazka</translation>
     </message>
     <message>
         <source>Try %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Proba %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
-        <translation type="unfinished"></translation>
+        <translation>Jeszcze raz szukaj IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozpocznij wysylanie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libqpe.ts b/i18n/pl/libqpe.ts
index 7db75f9..90d6472 100644
--- a/i18n/pl/libqpe.ts
+++ b/i18n/pl/libqpe.ts
@@ -861,6 +861,22 @@ Zwolnij wiecej pamieci</translation>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Blad</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/pl/libqpickboard.ts b/i18n/pl/libqpickboard.ts
index 488fb8f..7eef6c6 100644
--- a/i18n/pl/libqpickboard.ts
+++ b/i18n/pl/libqpickboard.ts
@@ -3,7 +3,7 @@
     <name>InputMethods</name>
     <message>
         <source>Pickboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Pickboard</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/librotateapplet.ts b/i18n/pl/librotateapplet.ts
index e9a8374..1d5371b 100644
--- a/i18n/pl/librotateapplet.ts
+++ b/i18n/pl/librotateapplet.ts
@@ -3,11 +3,11 @@
     <name>RotateApplet</name>
     <message>
         <source>Rotate shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrot Obrot</translation>
     </message>
     <message>
         <source>Rotate</source>
-        <translation type="unfinished"></translation>
+        <translation>Obroc</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libsuspendapplet.ts b/i18n/pl/libsuspendapplet.ts
index bdfb04c..ad1f6c8 100644
--- a/i18n/pl/libsuspendapplet.ts
+++ b/i18n/pl/libsuspendapplet.ts
@@ -3,11 +3,11 @@
     <name>SuspendApplet</name>
     <message>
         <source>Suspend shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrot Uspij</translation>
     </message>
     <message>
         <source>Suspend</source>
-        <translation type="unfinished"></translation>
+        <translation>Uspij</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libtheme.ts b/i18n/pl/libtheme.ts
index 53a4018..45cffa4 100644
--- a/i18n/pl/libtheme.ts
+++ b/i18n/pl/libtheme.ts
@@ -3,34 +3,34 @@
     <name>Styles</name>
     <message>
         <source>Themed style</source>
-        <translation type="unfinished"></translation>
+        <translation>Styl z motywami</translation>
     </message>
     <message>
         <source>KDE2 theme compatible style engine</source>
-        <translation type="unfinished"></translation>
+        <translation>Mechanizm stylów kompatybilny z motywami KDE2</translation>
     </message>
 </context>
 <context>
     <name>ThemeSettings</name>
     <message>
         <source>Theme Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Styl Motywu</translation>
     </message>
     <message>
         <source>Select the theme to be used</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz motyw</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Opis</translation>
     </message>
     <message>
         <source>[No theme]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Brak motywu]</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/mail.ts b/i18n/pl/mail.ts
index d251908..785a655 100644
--- a/i18n/pl/mail.ts
+++ b/i18n/pl/mail.ts
@@ -3,901 +3,903 @@
     <name>AccountEditor</name>
     <message>
         <source>Warning</source>
-        <translation type="unfinished"></translation>
+        <translation>Ostrzezenie</translation>
     </message>
     <message>
         <source>&lt;p&gt;Your signature is longer than 4 lines. This is considered inpolite by many people. You should shorten your signature.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Twoja sygnatura ma wiecej niz 4 linie. Jest to przez wielu ludzi uwazane za nietakt. Powinienes skrocic sygnature.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Change</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien</translation>
     </message>
     <message>
         <source>Continue</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontynuuj</translation>
     </message>
 </context>
 <context>
     <name>AccountEditorBase</name>
     <message>
         <source>Account Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytor konta</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer</translation>
     </message>
     <message>
         <source>&lt;b&gt;Port:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Port:</translation>
     </message>
     <message>
         <source>&lt;b&gt;IMAP:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;IMAP:</translation>
     </message>
     <message>
         <source>[--]</source>
-        <translation type="unfinished"></translation>
+        <translation>[--]</translation>
     </message>
     <message>
         <source>&lt;b&gt;SMTP:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;SMTP:</translation>
     </message>
     <message>
         <source>&lt;b&gt;User:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Uzytkownik:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Pass:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Haslo:</translation>
     </message>
     <message>
         <source>Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Tozsamosc</translation>
     </message>
     <message>
         <source>&lt;b&gt;Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Imie:</translation>
     </message>
     <message>
         <source>&lt;b&gt;E-Mail:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;E-Mail:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Org:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Org:</translation>
     </message>
     <message>
         <source>Advanced</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaawansowane</translation>
     </message>
     <message>
         <source>Cc</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopia</translation>
     </message>
     <message>
         <source>Bcc</source>
-        <translation type="unfinished"></translation>
+        <translation>UkrKopia</translation>
     </message>
     <message>
         <source>Reply-To</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz-Do</translation>
     </message>
     <message>
         <source>&lt;b&gt;Signature:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Sygnatura:</translation>
     </message>
     <message>
         <source>SSL</source>
-        <translation type="unfinished"></translation>
+        <translation>SSL</translation>
     </message>
     <message>
         <source>IMAP</source>
-        <translation type="unfinished"></translation>
+        <translation>IMAP</translation>
     </message>
     <message>
         <source>Use SSL</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzywaj SSL</translation>
     </message>
     <message>
         <source>993</source>
-        <translation type="unfinished"></translation>
+        <translation>993</translation>
     </message>
     <message>
         <source>SMTP</source>
-        <translation type="unfinished"></translation>
+        <translation>SMTP</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
     <message>
         <source>There are no entries in the addressbook.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie ma wpisow w ksiazce adresowej.</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select at least one address entry.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Musisz wybrac przynajmniej jeden adres.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
 </context>
 <context>
     <name>AddressPickerBase</name>
     <message>
         <source>Address Picker</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybor Adresu</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Anuluj</translation>
     </message>
 </context>
 <context>
     <name>Composer</name>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>Please select an entry first.</source>
-        <translation type="unfinished"></translation>
+        <translation>Najpierw wybierz wpis.</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Set Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw Opis</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Description</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;div align=center&gt;Opis</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to specify a recipient.&lt;br&gt;(eg: foo@bar.org)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Musisz okreslic odbiorce.&lt;br&gt;(np.: foo@bar.org)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;There was a problem sending some of the queued mails.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Wystapil problem podczas wysylania niektorych wiadomosci z kolejki.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Success</source>
-        <translation type="unfinished"></translation>
+        <translation>Sukces</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was queued successfully.&lt;/p&gt;&lt;p&gt;The queue contains </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;List zostal dodany do kolejki.&lt;/p&gt;&lt;p&gt;Kolejka zawiera</translation>
     </message>
     <message>
         <source> mails.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>listy.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Error occoured during sending.&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;font color=#ff0000&gt;Podczas wysylania wystapil blad.&lt;/font&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1&lt;/p</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;%1&lt;/p</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail was sent successfully.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;List zostal wyslany.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The queued mails </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Listy w kolejce</translation>
     </message>
     <message>
         <source> of </source>
-        <translation type="unfinished"></translation>
+        <translation>z</translation>
     </message>
 </context>
 <context>
     <name>ComposerBase</name>
     <message>
         <source>Compose Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Pisz Wiadomosc</translation>
     </message>
     <message>
         <source>Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>List</translation>
     </message>
     <message>
         <source>Send the mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyslij list</translation>
     </message>
     <message>
         <source>Queue the mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj list do kolejki</translation>
     </message>
     <message>
         <source>Attach a file</source>
-        <translation type="unfinished"></translation>
+        <translation>Dolacz plik</translation>
     </message>
     <message>
         <source>Addressbook</source>
-        <translation type="unfinished"></translation>
+        <translation>Ksiazka adresowa</translation>
     </message>
     <message>
         <source>From</source>
-        <translation type="unfinished"></translation>
+        <translation>Od</translation>
     </message>
     <message>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz</translation>
     </message>
     <message>
         <source>To</source>
-        <translation type="unfinished"></translation>
+        <translation>Do</translation>
     </message>
     <message>
         <source>Cc</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopia</translation>
     </message>
     <message>
         <source>Bcc</source>
-        <translation type="unfinished"></translation>
+        <translation>UkrKopia</translation>
     </message>
     <message>
         <source>Subj.</source>
-        <translation type="unfinished"></translation>
+        <translation>Temat.</translation>
     </message>
     <message>
         <source>Prio.</source>
-        <translation type="unfinished"></translation>
+        <translation>Prior.</translation>
     </message>
     <message>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Niski</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation type="unfinished"></translation>
+        <translation>Normalny</translation>
     </message>
     <message>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysoki</translation>
     </message>
     <message>
         <source>Add an Attachement</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj zalacznik</translation>
     </message>
     <message>
         <source>Remove Attachement</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun zalacznik</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Opis</translation>
     </message>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien nazwe</translation>
     </message>
     <message>
         <source>Change Description</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien opis</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiag</name>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>&lt;p&gt;You have to select an account first.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Najpierw musisz wybrac konto.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Question</source>
-        <translation type="unfinished"></translation>
+        <translation>Pytanie</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you relly want to delete the selected account?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Czy na pewno chcesz usunac wybrane konto?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
 </context>
 <context>
     <name>ConfigDiagBase</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguracja</translation>
     </message>
     <message>
         <source>Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation>Konta</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>[Hidden]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Ukryte]</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowe</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Ogolne</translation>
     </message>
     <message>
         <source>Mail notification</source>
-        <translation type="unfinished"></translation>
+        <translation>Powiadamianie</translation>
     </message>
     <message>
         <source>Blink LED</source>
-        <translation type="unfinished"></translation>
+        <translation>Migajaca dioda</translation>
     </message>
     <message>
         <source>Play sound</source>
-        <translation type="unfinished"></translation>
+        <translation>Odtworz dzwiek</translation>
     </message>
     <message>
         <source>&lt;b&gt;Check&amp;nbsp;every</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Sprawdzaj&amp;nbsp;co</translation>
     </message>
     <message>
         <source> min</source>
-        <translation type="unfinished"></translation>
+        <translation>min</translation>
     </message>
     <message>
         <source>Disable mail notification</source>
-        <translation type="unfinished"></translation>
+        <translation>Wylacz powiadamianie</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Mail version %1&lt;/b&gt;&lt;hr&gt;
 Sponsored and Programmed by LISAsystems&lt;br&gt;
 Visit http://www.lisa.de/ for Information.
                             </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Mail - wersja %1&lt;/b&gt;&lt;hr&gt;
+Sponsorowane i Napisane przez LISAsystems&lt;br&gt;
+Po informacje odwiedz http://www.lisa.de/.</translation>
     </message>
 </context>
 <context>
     <name>FolderWidget</name>
     <message>
         <source>Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien nazwe</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Move</source>
-        <translation type="unfinished"></translation>
+        <translation>Przenies</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Create folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Stworz folder</translation>
     </message>
     <message>
         <source>Rescan folder list</source>
-        <translation type="unfinished"></translation>
+        <translation>Przeskanuj liste folderow</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select an item first.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Najpierw wybierz pozycje.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Question</source>
-        <translation type="unfinished"></translation>
+        <translation>Pytanie</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete &lt;pre&gt;%1&lt;/pre&gt;?</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Czy na pewno chcesz usunac &lt;pre&gt;%1&lt;/pre&gt;?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Foldername</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwafolderu</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please enter the name of the new folder.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Wpisz nazwe nowego folderu.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Looking up host...</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukanie hosta...</translation>
     </message>
     <message>
         <source>Host found.</source>
-        <translation type="unfinished"></translation>
+        <translation>Host znaleziony.</translation>
     </message>
     <message>
         <source>Connected to host.</source>
-        <translation type="unfinished"></translation>
+        <translation>Polaczony do hosta.</translation>
     </message>
     <message>
         <source>&lt;p&gt;The IMAP connection was refused.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Odmowiono polaczenia IMAP.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;The host was not found.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Host nie zostal znaleziony.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;There was an error while reading from the socket.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Wystapil blad podczas czytania z gniazda.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Login failed. Check your password/username.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Logowanie sie nie powiodlo. Sprawdz nazwe uzytkownika i haslo.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unknown error was encountered.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Wystapil nierozpoznany blad.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Disconnected.</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozlaczony.</translation>
     </message>
     <message>
         <source>Login successfull!</source>
-        <translation type="unfinished"></translation>
+        <translation>Logowanie udane!</translation>
     </message>
     <message>
         <source>&lt;p&gt;Login failed. Go away.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Logowanie sie nie udalo. Odejdz.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Renaming successfull!</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmiana nazwy udana!</translation>
     </message>
     <message>
         <source>&lt;p&gt;Renaming failed. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Zmiana nazwy sie nie udala. (Serwer odpowiedzial: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Deletion successfull!</source>
-        <translation type="unfinished"></translation>
+        <translation>Usuniecie sie udalo!</translation>
     </message>
     <message>
         <source>&lt;p&gt;Delete failed. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Usuniecie sie nie udalo. (Serwer odpowiedzial: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Folder created. Rescanning...</source>
-        <translation type="unfinished"></translation>
+        <translation>Folder utworzony. Skanuje...</translation>
     </message>
     <message>
         <source>&lt;p&gt;The folder could not be created. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Folder nie mogl byc utworzony. (Serwer odpowiedzial: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t open folder cache file for writing!&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Nie mozna otworzyc cache&apos;u folderu do zapisu!&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Got folder list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pobierz liste folderow.</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t retrieve the folder list. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Nie mozna pobrac listy folderow. (Serwer odpowiedzial: %1)&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>MailTable</name>
     <message>
         <source>From</source>
-        <translation type="unfinished"></translation>
+        <translation>Od</translation>
     </message>
     <message>
         <source>Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Temat</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Seen</source>
-        <translation type="unfinished"></translation>
+        <translation>Widziany</translation>
     </message>
     <message>
         <source>Unseen</source>
-        <translation type="unfinished"></translation>
+        <translation>Niewidziany</translation>
     </message>
     <message>
         <source>Marked</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaznaczony</translation>
     </message>
     <message>
         <source>Unmarked</source>
-        <translation type="unfinished"></translation>
+        <translation>Niezaznaczony</translation>
     </message>
     <message>
         <source>Mark as...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaznacz jako...</translation>
     </message>
     <message>
         <source>Delete Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun poczte</translation>
     </message>
     <message>
         <source>Mailbox contained no mails.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie ma listow w skrzynce.</translation>
     </message>
     <message>
         <source>Getting mail headers...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pobieranie naglowkow listow...</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>&lt;p&gt;An error occoured during the selection of the mailbox. (Server said: %1)&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Podczas wybierania skrzynki pocztowej wystapil blad. (Serwer odpowiedzial: %1)&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Stopped</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymany</translation>
     </message>
     <message>
         <source>Got all mail headers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pobrane wszystkie naglowki listow.</translation>
     </message>
     <message>
         <source>&lt;font color=#ff0000&gt;Couldn&apos;t fetch mail.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;font color=#ff0000&gt;Nie mozna pobrac poczty.</translation>
     </message>
 </context>
 <context>
     <name>MainWindowBase</name>
     <message>
         <source>E-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>E-Mail</translation>
     </message>
     <message>
         <source>Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Poczta</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwery</translation>
     </message>
     <message>
         <source>Compose new mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Pisz nowy list</translation>
     </message>
     <message>
         <source>Send queued mails</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyslij listy z kolejki</translation>
     </message>
     <message>
         <source>Show/hide folders</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz/ukryj foldery</translation>
     </message>
     <message>
         <source>Search mails</source>
-        <translation type="unfinished"></translation>
+        <translation>Przeszukaj listy</translation>
     </message>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguracja</translation>
     </message>
 </context>
 <context>
     <name>OpenDiagBase</name>
     <message>
         <source>Open file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Otworz plik...</translation>
     </message>
     <message>
         <source> Stop </source>
-        <translation type="unfinished"></translation>
+        <translation>Stop</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; kB of &lt;b&gt;%2&lt;/b&gt; kB at &lt;b&gt;%3&lt;/b&gt; kB/s</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;%1&lt;/b&gt; kB z &lt;b&gt;%2&lt;/b&gt; kB przy &lt;b&gt;%3&lt;/b&gt; kB/s</translation>
     </message>
     <message>
         <source>[Icon]</source>
-        <translation type="unfinished"></translation>
+        <translation>[Ikona]</translation>
     </message>
     <message>
         <source>&lt;i&gt;application/v-card</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;i&gt;application/v-card</translation>
     </message>
     <message>
         <source>Open using an application</source>
-        <translation type="unfinished"></translation>
+        <translation>Otworz uzywajac aplikacji</translation>
     </message>
     <message>
         <source>Save to disk</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz na dysk</translation>
     </message>
     <message>
         <source>Display</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz</translation>
     </message>
     <message>
         <source>Save to</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz do</translation>
     </message>
     <message>
         <source>RAM</source>
-        <translation type="unfinished"></translation>
+        <translation>RAM</translation>
     </message>
     <message>
         <source>CF</source>
-        <translation type="unfinished"></translation>
+        <translation>CF</translation>
     </message>
     <message>
         <source>SD</source>
-        <translation type="unfinished"></translation>
+        <translation>SD</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>(no name)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brak nazwy)</translation>
     </message>
     <message>
         <source>&lt;Foldertree not known.&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Drzewofolderow nieznane.&gt;</translation>
     </message>
     <message>
         <source>Inbox</source>
-        <translation type="unfinished"></translation>
+        <translation>Otrzymane</translation>
     </message>
     <message>
         <source>(no from)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brak nadawcy)</translation>
     </message>
     <message>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brak tematu)</translation>
     </message>
     <message>
         <source>(no date)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brak daty)</translation>
     </message>
 </context>
 <context>
     <name>RenameBase</name>
     <message>
         <source>Renaming</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmiana nazwy</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;Renaming</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;div align=center&gt;Zmiana nazwy</translation>
     </message>
     <message>
         <source>&lt;div align=center&gt;to</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;div align=center&gt;na</translation>
     </message>
 </context>
 <context>
     <name>SearchDiag</name>
     <message>
         <source>Body</source>
-        <translation type="unfinished"></translation>
+        <translation>Tresc</translation>
     </message>
     <message>
         <source>Header Field</source>
-        <translation type="unfinished"></translation>
+        <translation>Pole naglowka</translation>
     </message>
     <message>
         <source>Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Temat</translation>
     </message>
     <message>
         <source>From</source>
-        <translation type="unfinished"></translation>
+        <translation>Od</translation>
     </message>
     <message>
         <source>To</source>
-        <translation type="unfinished"></translation>
+        <translation>Do</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please enter what to search for.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Wpisz szukane wyrazenie.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a folder.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Wybierz folder.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please enter a header field to search in.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Podaj pole naglowka do przeszukania.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Could not select the folder. Aborting. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Nie mozna wybrac folderu. Przerywam. (Serwer odpowiedzial: %1)</translation>
     </message>
     <message>
         <source>Results</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyniki</translation>
     </message>
     <message>
         <source>&lt;p&gt;No mails match your criteria.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Brak listow spelniajacych kryteria.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Search failed. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Wyszukiwanie sie nie udalo. (Serwer odpowiedzial: %1)</translation>
     </message>
     <message>
         <source>&lt;p&gt;Couldn&apos;t fetch the mail headers. (Server said: %1)</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Nie mozna pobrac naglowkow listow. (Serwer odpowiedzial: %1)</translation>
     </message>
 </context>
 <context>
     <name>SearchDiagBase</name>
     <message>
         <source>Mail Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyszukiwanie listow</translation>
     </message>
     <message>
         <source>&lt;b&gt;Search&amp;nbsp;in:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Szukaj&amp;nbsp;w:</translation>
     </message>
     <message>
         <source>&lt;b&gt;For:</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Szukaj:</translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/div&gt;&lt;b&gt;From:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;To:&lt;/b&gt; %3&lt;br&gt;%4%5&lt;b&gt;Date:&lt;/b&gt; %6&lt;hr&gt;&lt;font face=fixed&gt;%7&lt;/font&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;html&gt;&lt;body&gt;&lt;div align=center&gt;&lt;b&gt;%1&lt;/b&gt;&lt;/div&gt;&lt;b&gt;Od:&lt;/b&gt; %2&lt;br&gt;&lt;b&gt;Do:&lt;/b&gt; %3&lt;br&gt;%4%5&lt;b&gt;Data:&lt;/b&gt; %6&lt;hr&gt;&lt;font face=fixed&gt;%7&lt;/font&gt;</translation>
     </message>
     <message>
         <source>(no subject)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brak tematu)</translation>
     </message>
     <message>
         <source>(no from)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brak nadawcy)</translation>
     </message>
     <message>
         <source>(no recipient)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brak odbiorcy)</translation>
     </message>
     <message>
         <source>&lt;b&gt;Cc:&lt;/b&gt; %1&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Kopia:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Bcc:&lt;/b&gt; %1&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;UkrKopia:&lt;/b&gt; %1&lt;br&gt;</translation>
     </message>
     <message>
         <source>(no date)</source>
-        <translation type="unfinished"></translation>
+        <translation>(brak daty)</translation>
     </message>
     <message>
         <source>Getting mail body from server. Please wait...</source>
-        <translation type="unfinished"></translation>
+        <translation>Pobieranie tresc listu z serwera. Prosze czekac...</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Tresc listu jeszcze nie zostala pobrana wiec nie mozesz jeszcze odpowiedziec.</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Tresc listu jeszcze nie zostala pobrana wiec nie mozesz jeszcze przeslac.</translation>
     </message>
     <message>
         <source>&lt;p&gt;I was unable to retrieve the mail from the server. You can try again later or give up.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Nie moglem pobrac poczty z serwera. Mozesz sprobowac pozniej lub zrezygnowac.&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>E-Mail by %1</source>
-        <translation type="unfinished"></translation>
+        <translation>E-Mail od %1</translation>
     </message>
     <message>
         <source>Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>List</translation>
     </message>
     <message>
         <source>Reply</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Przeslij</translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation>Zalaczniki</translation>
     </message>
     <message>
         <source>Delete Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun list</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/mailit.ts b/i18n/pl/mailit.ts
index 3d729bc..fd9657c 100644
--- a/i18n/pl/mailit.ts
+++ b/i18n/pl/mailit.ts
@@ -200,6 +200,19 @@ Check user name and password&lt;/qt&gt;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/pl/mindbreaker.ts b/i18n/pl/mindbreaker.ts
index eab7625..5e19088 100644
--- a/i18n/pl/mindbreaker.ts
+++ b/i18n/pl/mindbreaker.ts
@@ -14,7 +14,7 @@
     <name>MindBreakerBoard</name>
     <message>
         <source>Go%1p%2</source>
-        <translation>Go%1p%2</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CurrentGo%1</source>
@@ -22,7 +22,7 @@
     </message>
     <message>
         <source>Answer%1</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedz%1</translation>
     </message>
     <message>
         <source>Reset Statistics</source>
@@ -34,7 +34,7 @@
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <source>Cancel</source>
diff --git a/i18n/pl/minesweep.ts b/i18n/pl/minesweep.ts
index c3a96bd..9bb5e15 100644
--- a/i18n/pl/minesweep.ts
+++ b/i18n/pl/minesweep.ts
@@ -23,7 +23,7 @@
     </message>
     <message>
         <source>Expert</source>
-        <translation type="unfinished"></translation>
+        <translation>Ekspert</translation>
     </message>
     <message>
         <source>Game</source>
diff --git a/i18n/pl/opie-console.ts b/i18n/pl/opie-console.ts
index 33bfa8f..9d35fa3 100644
--- a/i18n/pl/opie-console.ts
+++ b/i18n/pl/opie-console.ts
@@ -3,98 +3,98 @@
     <name>ATConfigDialog</name>
     <message>
         <source>Dialing parameter setup</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia parametru dzwonienia</translation>
     </message>
     <message>
         <source>Settings1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia1</translation>
     </message>
     <message>
         <source>Settings2</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia2</translation>
     </message>
     <message>
         <source>Init string </source>
-        <translation type="unfinished"></translation>
+        <translation>Ciag Init</translation>
     </message>
     <message>
         <source>Reset string </source>
-        <translation type="unfinished"></translation>
+        <translation>Ciag Reset</translation>
     </message>
     <message>
         <source>Dialing prefix #1 </source>
-        <translation type="unfinished"></translation>
+        <translation>Prefiks dzwonienia #1</translation>
     </message>
     <message>
         <source>Dialing suffix #1 </source>
-        <translation type="unfinished"></translation>
+        <translation>Sufiks dzwonienia #1</translation>
     </message>
     <message>
         <source>Dialing prefix #2 </source>
-        <translation type="unfinished"></translation>
+        <translation>Prefiks dzwonienia #2</translation>
     </message>
     <message>
         <source>Dialing suffix #2 </source>
-        <translation type="unfinished"></translation>
+        <translation>Sufiks dzwonienia #2</translation>
     </message>
     <message>
         <source>Dialing prefix #3 </source>
-        <translation type="unfinished"></translation>
+        <translation>Prefiks dzwonienia #3</translation>
     </message>
     <message>
         <source>Dialing suffix #3 </source>
-        <translation type="unfinished"></translation>
+        <translation>Sufiks dzwonienia #3</translation>
     </message>
     <message>
         <source>Connect string </source>
-        <translation type="unfinished"></translation>
+        <translation>Ciag Connect</translation>
     </message>
     <message>
         <source>Hang-up string </source>
-        <translation type="unfinished"></translation>
+        <translation>Ciag Hang-up</translation>
     </message>
     <message>
         <source>Dial time </source>
-        <translation type="unfinished"></translation>
+        <translation>Czas dzwonienia</translation>
     </message>
     <message>
         <source>Delay before redial </source>
-        <translation type="unfinished"></translation>
+        <translation>Opoznienie pomiedzy probami</translation>
     </message>
     <message>
         <source>Number of tries </source>
-        <translation type="unfinished"></translation>
+        <translation>Liczba prob</translation>
     </message>
     <message>
         <source>DTR drop time (0=no) </source>
-        <translation type="unfinished"></translation>
+        <translation>Czas porzucenia DTR (0=nie)</translation>
     </message>
     <message>
         <source>Auto bps detect </source>
-        <translation type="unfinished"></translation>
+        <translation>Automatyczne wykrywanie bps</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>Modem has DCD line </source>
-        <translation type="unfinished"></translation>
+        <translation>Modem ma linie DCD</translation>
     </message>
     <message>
         <source>Multi-line untag </source>
-        <translation type="unfinished"></translation>
+        <translation>Wieloliniowe odznaczanie</translation>
     </message>
 </context>
 <context>
     <name>BTConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Urzadzenie</translation>
     </message>
     <message>
         <source>Or peer mac address</source>
@@ -105,80 +105,80 @@
     <name>ConfigDialog</name>
     <message>
         <source>Edit Connection Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj profil polaczenia</translation>
     </message>
     <message>
         <source>New Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowe polaczenie</translation>
     </message>
 </context>
 <context>
     <name>ConfigureBase</name>
     <message>
         <source>Configure</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguruj</translation>
     </message>
     <message>
         <source>Profile Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa profilu</translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dodaj</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Edytuj</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Usun</translation>
     </message>
 </context>
 <context>
     <name>ConsoleConfigWidget</name>
     <message>
         <source>Command to execute</source>
-        <translation type="unfinished"></translation>
+        <translation>Polecenie do wykonania</translation>
     </message>
     <message>
         <source>Environment Variables</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmienne srodowiskowe</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa</translation>
     </message>
     <message>
         <source>Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Wartosc</translation>
     </message>
     <message>
         <source>Name :</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Value :</source>
-        <translation type="unfinished"></translation>
+        <translation>Wartosc:</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj</translation>
     </message>
 </context>
 <context>
     <name>DialDialog</name>
     <message>
         <source>Enter number</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz numer</translation>
     </message>
     <message>
         <source>Enter the number you want to dial. When finished, press ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz numer, na ktory chcesz dzwonic. Gdy skonczysz wcisnij ok</translation>
     </message>
 </context>
 <context>
@@ -189,638 +189,638 @@
     </message>
     <message>
         <source>Terminal Emulation:</source>
-        <translation type="unfinished"></translation>
+        <translation>Emulacja terminala:</translation>
     </message>
     <message>
         <source>IO Layer:</source>
-        <translation type="unfinished"></translation>
+        <translation>Warstwa IO:</translation>
     </message>
     <message>
         <source>Look</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyglad</translation>
     </message>
     <message>
         <source>Foreground:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wierzch:</translation>
     </message>
     <message>
         <source>Black</source>
-        <translation type="unfinished"></translation>
+        <translation>Czarny</translation>
     </message>
     <message>
         <source>White</source>
-        <translation type="unfinished"></translation>
+        <translation>Bialy</translation>
     </message>
     <message>
         <source>Gray</source>
-        <translation type="unfinished"></translation>
+        <translation>Szary</translation>
     </message>
     <message>
         <source>Background:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tlo:</translation>
     </message>
     <message>
         <source>Font:</source>
-        <translation type="unfinished"></translation>
+        <translation>Czcionka:</translation>
     </message>
     <message>
         <source>Micro</source>
-        <translation type="unfinished"></translation>
+        <translation>Mikro</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Mala</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Srednia</translation>
     </message>
 </context>
 <context>
     <name>FileReceive</name>
     <message>
         <source>Could not start</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna rozpoczac</translation>
     </message>
 </context>
 <context>
     <name>FileTransfer</name>
     <message>
         <source>Was not able to fork</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie byl w stanie wykonac &quot;fork&quot;</translation>
     </message>
     <message>
         <source>Could not start</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna rozpoczac</translation>
     </message>
 </context>
 <context>
     <name>FunctionKeyboardConfig</name>
     <message>
         <source>Dimensions</source>
-        <translation type="unfinished"></translation>
+        <translation>Wymiary</translation>
     </message>
     <message>
         <source>Edit Key</source>
-        <translation type="unfinished"></translation>
+        <translation>Edycja Klawisza</translation>
     </message>
 </context>
 <context>
     <name>IOLayerBase</name>
     <message>
         <source>Speed</source>
-        <translation type="unfinished"></translation>
+        <translation>Szybkosc</translation>
     </message>
     <message>
         <source>Flow control</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontrola przeplywu</translation>
     </message>
     <message>
         <source>Hardware</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprzet</translation>
     </message>
     <message>
         <source>Software</source>
-        <translation type="unfinished"></translation>
+        <translation>Oprogramowanie</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak</translation>
     </message>
     <message>
         <source>Parity</source>
-        <translation type="unfinished"></translation>
+        <translation>Parzystosc</translation>
     </message>
     <message>
         <source>Odd</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieparzysty</translation>
     </message>
     <message>
         <source>Even</source>
-        <translation type="unfinished"></translation>
+        <translation>Parzysty</translation>
     </message>
     <message>
         <source>Data Bits</source>
-        <translation type="unfinished"></translation>
+        <translation>Bity Danych</translation>
     </message>
     <message>
         <source>5</source>
-        <translation type="unfinished"></translation>
+        <translation>5</translation>
     </message>
     <message>
         <source>6</source>
-        <translation type="unfinished"></translation>
+        <translation>6</translation>
     </message>
     <message>
         <source>7</source>
-        <translation type="unfinished"></translation>
+        <translation>7</translation>
     </message>
     <message>
         <source>8</source>
-        <translation type="unfinished"></translation>
+        <translation>8</translation>
     </message>
     <message>
         <source>Stop Bits</source>
-        <translation type="unfinished"></translation>
+        <translation>Bity Zatrzymania</translation>
     </message>
     <message>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <source>1.5</source>
-        <translation type="unfinished"></translation>
+        <translation>1.5</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
     <message>
         <source>115200 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>115200 bodow</translation>
     </message>
     <message>
         <source>57600 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>57600 bodow</translation>
     </message>
     <message>
         <source>38400 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>38400 bodow</translation>
     </message>
     <message>
         <source>19200 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>19200 bodow</translation>
     </message>
     <message>
         <source>9600 baud</source>
-        <translation type="unfinished"></translation>
+        <translation>9600 bodow</translation>
     </message>
 </context>
 <context>
     <name>IOSerial</name>
     <message>
         <source>Not connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie polaczony</translation>
     </message>
     <message>
         <source>Invalid baud rate</source>
-        <translation type="unfinished"></translation>
+        <translation>Zla liczba bodow</translation>
     </message>
     <message>
         <source>Device is already connected</source>
-        <translation type="unfinished"></translation>
+        <translation>Urzadzenie jest juz polaczone</translation>
     </message>
 </context>
 <context>
     <name>IrdaConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Urzadzenie</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Configure Profiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguruj profile</translation>
     </message>
     <message>
         <source>New Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowe polaczenie</translation>
     </message>
     <message>
         <source>Save Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz polaczenie</translation>
     </message>
     <message>
         <source>Connect</source>
-        <translation type="unfinished"></translation>
+        <translation>Polacz</translation>
     </message>
     <message>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozlacz</translation>
     </message>
     <message>
         <source>QuickLaunch</source>
-        <translation type="unfinished"></translation>
+        <translation>SzybkiStart</translation>
     </message>
     <message>
         <source>The shell button launches the &quot;default&quot; profile. If there is none default values are taken</source>
-        <translation type="unfinished"></translation>
+        <translation>Przycisk powloki uruchamia &quot;domyslny&quot; profil. Jesli nie ma zadnego przyjmowane sa domyslne wartosci</translation>
     </message>
     <message>
         <source>Transfer file...</source>
-        <translation type="unfinished"></translation>
+        <translation>Transfer pliku...</translation>
     </message>
     <message>
         <source>Line wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>Zawijanie linii</translation>
     </message>
     <message>
         <source>Full screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Pelny ekran</translation>
     </message>
     <message>
         <source>Save history</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz historie</translation>
     </message>
     <message>
         <source>Terminate</source>
-        <translation type="unfinished"></translation>
+        <translation>Zabij</translation>
     </message>
     <message>
         <source>Close Window</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij okno</translation>
     </message>
     <message>
         <source>Run Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Uruchom skrypt</translation>
     </message>
     <message>
         <source>Record Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Nagraj skrypt</translation>
     </message>
     <message>
         <source>Save Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz skrypt</translation>
     </message>
     <message>
         <source>Open Keyboard...</source>
-        <translation type="unfinished"></translation>
+        <translation>Otworz klawiature...</translation>
     </message>
     <message>
         <source>New from Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy z Profilu</translation>
     </message>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Polaczenie</translation>
     </message>
     <message>
         <source>Scripts</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrypty</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj</translation>
     </message>
     <message>
         <source>Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Wklej</translation>
     </message>
     <message>
         <source>Script</source>
-        <translation type="unfinished"></translation>
+        <translation>Skrypt</translation>
     </message>
     <message>
         <source>&lt;qt&gt;There is no Connection.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Nie ma polaczenia.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>History</source>
-        <translation type="unfinished"></translation>
+        <translation>Historia</translation>
     </message>
     <message>
         <source>New Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy profil</translation>
     </message>
     <message>
         <source>Save Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz profil</translation>
     </message>
 </context>
 <context>
     <name>ModemConfigWidget</name>
     <message>
         <source>Modem is attached to:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem jest podlaczony do:</translation>
     </message>
     <message>
         <source>Enter telefon number here:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu domyslny numer telefonu:</translation>
     </message>
     <message>
         <source>AT commands</source>
-        <translation type="unfinished"></translation>
+        <translation>Polecenia AT</translation>
     </message>
     <message>
         <source>Enter number</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz numer</translation>
     </message>
 </context>
 <context>
     <name>NoOptions</name>
     <message>
         <source>This Plugin does not support any configurations</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta Wtyczka nie obsluguje zadnej konfiguracji</translation>
     </message>
 </context>
 <context>
     <name>ProfileEditorDialog</name>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Polaczenie</translation>
     </message>
     <message>
         <source>Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminal</translation>
     </message>
     <message>
         <source>Auto connect after load</source>
-        <translation type="unfinished"></translation>
+        <translation>Polacz automatycznie po zaladowaniu</translation>
     </message>
     <message>
         <source>Local Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokalna konsola</translation>
     </message>
     <message>
         <source>New Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy profil</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Opie Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Konsola Opie</translation>
     </message>
     <message>
         <source>Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Porazka</translation>
     </message>
     <message>
         <source>Connecting failed for this session.</source>
-        <translation type="unfinished"></translation>
+        <translation>Polaczenie dla tej sesji nie udalo sie.</translation>
     </message>
     <message>
         <source>Session failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Sesja sie nie powiodla</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot open session: Not all components were found.&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Nie mozna otworzyc sesji: Nie znaleziono wszystkich komponentow.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Transfer mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Tryb transferu</translation>
     </message>
     <message>
         <source>Send</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyslij</translation>
     </message>
     <message>
         <source>Receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Odbierz</translation>
     </message>
     <message>
         <source>Send file</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyslij plik</translation>
     </message>
     <message>
         <source>Transfer protocol</source>
-        <translation type="unfinished"></translation>
+        <translation>Protokol transferu</translation>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation>Postep</translation>
     </message>
     <message>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Status</translation>
     </message>
     <message>
         <source>Ready</source>
-        <translation type="unfinished"></translation>
+        <translation>Gotowy</translation>
     </message>
     <message>
         <source>Start transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozpocznij transfer</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <source>File transfer</source>
-        <translation type="unfinished"></translation>
+        <translation>Transfer pliku</translation>
     </message>
     <message>
         <source>Attention</source>
-        <translation type="unfinished"></translation>
+        <translation>Uwaga</translation>
     </message>
     <message>
         <source>No file has been specified.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie zostal okreslony zaden plik.</translation>
     </message>
     <message>
         <source>Sending...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysylanie...</translation>
     </message>
     <message>
         <source>Receiving...</source>
-        <translation type="unfinished"></translation>
+        <translation>Odbieranie...</translation>
     </message>
     <message>
         <source>Cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation>Anulowany</translation>
     </message>
     <message>
         <source>The file transfer has been cancelled.</source>
-        <translation type="unfinished"></translation>
+        <translation>Transfer pliku zostal anulowany.</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>Operation not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Operacja nie obslugiwana.</translation>
     </message>
     <message>
         <source>Transfer could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation>Transfer nie mogl byc rozpoczety.</translation>
     </message>
     <message>
         <source>No error.</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak bledu.</translation>
     </message>
     <message>
         <source>Undefined error occured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wystapil niezdefiniowany blad.</translation>
     </message>
     <message>
         <source>Incomplete transfer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Niekompletny transfer.</translation>
     </message>
     <message>
         <source>Unknown error occured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wystapil nieznany blad.</translation>
     </message>
     <message>
         <source>Sent</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyslany</translation>
     </message>
     <message>
         <source>File has been sent.</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik zostal wyslany.</translation>
     </message>
     <message>
         <source>Received</source>
-        <translation type="unfinished"></translation>
+        <translation>Odebrany</translation>
     </message>
     <message>
         <source>File has been received.</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik zostal odebrany.</translation>
     </message>
     <message>
         <source>Profile name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa profilu</translation>
     </message>
     <message>
         <source>Profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Profil</translation>
     </message>
     <message>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Polaczenie</translation>
     </message>
     <message>
         <source>Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminal</translation>
     </message>
     <message>
         <source>Special Keys</source>
-        <translation type="unfinished"></translation>
+        <translation>Klawisze specjalne</translation>
     </message>
     <message>
         <source>Invalid profile</source>
-        <translation type="unfinished"></translation>
+        <translation>Nieprawidlowy profil</translation>
     </message>
     <message>
         <source>Please enter a profile name.</source>
-        <translation type="unfinished"></translation>
+        <translation>Podaj nazwe profilu.</translation>
     </message>
     <message>
         <source>Z-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Z-Modem</translation>
     </message>
     <message>
         <source>Y-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Y-Modem</translation>
     </message>
     <message>
         <source>X-Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>X-Modem</translation>
     </message>
     <message>
         <source>Serial</source>
-        <translation type="unfinished"></translation>
+        <translation>Szeregowy</translation>
     </message>
     <message>
         <source>Modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Modem</translation>
     </message>
     <message>
         <source>Local Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokalna konsola</translation>
     </message>
     <message>
         <source>Default Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslny terminal</translation>
     </message>
     <message>
         <source>Default Keyboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Domyslna klawiatura</translation>
     </message>
     <message>
         <source>SynchronizedFile</source>
-        <translation type="unfinished"></translation>
+        <translation>PlikZsynchronizowany</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybieranie numeru: %1</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Porazka</translation>
     </message>
     <message>
         <source>Dialing the number failed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybieranie numeru nie powiodlo sie.</translation>
     </message>
     <message>
         <source>Cancelling...</source>
-        <translation type="unfinished"></translation>
+        <translation>Anulowanie...</translation>
     </message>
     <message>
         <source>Searching modem</source>
-        <translation type="unfinished"></translation>
+        <translation>Szukanie modemu</translation>
     </message>
     <message>
         <source>Initializing...</source>
-        <translation type="unfinished"></translation>
+        <translation>Inicjalizacja...</translation>
     </message>
     <message>
         <source>Reset speakers</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeruj glosniki</translation>
     </message>
     <message>
         <source>Turning off dialtone</source>
-        <translation type="unfinished"></translation>
+        <translation>Wylaczanie dzwieku dzwonienia</translation>
     </message>
     <message>
         <source>Dial number</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz numer</translation>
     </message>
     <message>
         <source>Line busy, redialing number</source>
-        <translation type="unfinished"></translation>
+        <translation>Linia zajeta, ponowne wybieranie</translation>
     </message>
     <message>
         <source>Connection established</source>
-        <translation type="unfinished"></translation>
+        <translation>Polaczenie nawiazane</translation>
     </message>
     <message>
         <source>Dismiss</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozlacz</translation>
     </message>
 </context>
 <context>
     <name>SerialConfigWidget</name>
     <message>
         <source>Device</source>
-        <translation type="unfinished"></translation>
+        <translation>Urzadzenie</translation>
     </message>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ terminalu</translation>
     </message>
     <message>
         <source>Color scheme</source>
-        <translation type="unfinished"></translation>
+        <translation>Schemat kolorow</translation>
     </message>
     <message>
         <source>Font size</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozmiar czcionki</translation>
     </message>
     <message>
         <source>small</source>
-        <translation type="unfinished"></translation>
+        <translation>mala</translation>
     </message>
     <message>
         <source>medium</source>
-        <translation type="unfinished"></translation>
+        <translation>srednia</translation>
     </message>
     <message>
         <source>large</source>
-        <translation type="unfinished"></translation>
+        <translation>wielka</translation>
     </message>
     <message>
         <source>Line-break conversions</source>
-        <translation type="unfinished"></translation>
+        <translation>Konwersje lamania linii</translation>
     </message>
     <message>
         <source>Inbound</source>
@@ -832,47 +832,47 @@
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcje</translation>
     </message>
     <message>
         <source>Local echo</source>
-        <translation type="unfinished"></translation>
+        <translation>Lokalne echo</translation>
     </message>
     <message>
         <source>Line wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>Zawijanie linii</translation>
     </message>
     <message>
         <source>VT 100</source>
-        <translation type="unfinished"></translation>
+        <translation>VT 100</translation>
     </message>
     <message>
         <source>VT 102</source>
-        <translation type="unfinished"></translation>
+        <translation>VT 102</translation>
     </message>
     <message>
         <source>Linux Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Konsola Linuksowa</translation>
     </message>
     <message>
         <source>X-Terminal</source>
-        <translation type="unfinished"></translation>
+        <translation>X-Terminal</translation>
     </message>
     <message>
         <source>black on white</source>
-        <translation type="unfinished"></translation>
+        <translation>czarny na bialym</translation>
     </message>
     <message>
         <source>white on black</source>
-        <translation type="unfinished"></translation>
+        <translation>bialy na czarnym</translation>
     </message>
     <message>
         <source>green on black</source>
-        <translation type="unfinished"></translation>
+        <translation>zielony na czarnym</translation>
     </message>
     <message>
         <source>orange on black</source>
-        <translation type="unfinished"></translation>
+        <translation>pomaranczowy na czarnym</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/opie-login.ts b/i18n/pl/opie-login.ts
index f4806d5..ac1555a 100644
--- a/i18n/pl/opie-login.ts
+++ b/i18n/pl/opie-login.ts
@@ -4,80 +4,84 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dotykaj krzyzykow mocno i dokladnie
+aby skalibrowac ekran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Witamy w Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
-        <translation type="unfinished"></translation>
+        <translation>Login</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;center&gt;Witamy w OPIE&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzytkownik</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Haslo</translation>
     </message>
     <message>
         <source>Suspend</source>
-        <translation type="unfinished"></translation>
+        <translation>Uspij</translation>
     </message>
     <message>
         <source>Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"></translation>
+        <translation>Restart</translation>
     </message>
     <message>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyjdz</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
-        <translation type="unfinished"></translation>
+        <translation>Zle haslo</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
-        <translation type="unfinished"></translation>
+        <translation>Podane haslo jest nieprawidlowe.</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Porazka</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna przelaczyc na nowego uzytkownika</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Opie zostalo zamkniete
+przez nieprzechwycony sygnal
+(%1)
+</translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna uruchomic Opie.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/opieftp.ts b/i18n/pl/opieftp.ts
index 84477a9..95a10e6 100644
--- a/i18n/pl/opieftp.ts
+++ b/i18n/pl/opieftp.ts
@@ -245,5 +245,9 @@ To musi byc puste</translation>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/qpe.ts b/i18n/pl/qpe.ts
index 10ba42e..3b2abf0 100644
--- a/i18n/pl/qpe.ts
+++ b/i18n/pl/qpe.ts
@@ -1,252 +1,327 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppMonitor</name>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished">Jezyk</translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished">Czas i Data</translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished">Informacje Osobiste</translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Problem z Aplikacja</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p&gt;%1 nie odpowiada.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p&gt;Czy chcesz wymusic zakonczenie aplikacji?&lt;/p&gt;</translation>
     </message>
-</context>
-<context>
-    <name>Calibrate</name>
     <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished">&lt;qt&gt;&lt;p&gt;Szybkie ladowanie tej aplikacji zostalo wylaczone. Kliknij i przytrzymaj na ikonie aplikacji by je ponownie wlaczyc.&lt;/qt&gt;</translation>
     </message>
     <message>
-        <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished">&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; zostalo zamkniete po otrzymaniu sygnalu %2&lt;/qt&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
     <message>
-        <source>Documents</source>
-        <translation type="unfinished"></translation>
+        <source>Application terminated</source>
+        <translation type="unfinished">Aplikacja zamknieta</translation>
     </message>
     <message>
-        <source>Icon View</source>
-        <translation type="unfinished"></translation>
+        <source>Application not found</source>
+        <translation type="unfinished">Aplikacja nie znaleziona</translation>
     </message>
     <message>
-        <source>List View</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished">&lt;qt&gt;Nie mozna zlokalizowac aplikacji &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Blad</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished">&lt;qt&gt;Nie mozna znalezc aplikacji %1&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
     </message>
 </context>
 <context>
-    <name>DesktopApplication</name>
+    <name>DesktopPowerAlerter</name>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
+        <source>Battery Status</source>
+        <translation type="unfinished">Stan Baterii</translation>
     </message>
     <message>
-        <source>Battery is running very low.</source>
-        <translation type="unfinished"></translation>
+        <source>Low Battery</source>
+        <translation type="unfinished">Slaba Bateria</translation>
     </message>
+</context>
+<context>
+    <name>FirstUse</name>
     <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished">&lt;&lt; Wstecz</translation>
     </message>
     <message>
-        <source>business card</source>
-        <translation type="unfinished"></translation>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished">Dalej &gt;&gt;</translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation type="unfinished"></translation>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished">Kliknij gdziekolwiek na ekranie by kontynuowac.</translation>
     </message>
     <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished">Prosze czekac, laduje ustawienia %1.</translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished">Prosze czekac...</translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished">Koncz</translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished">Unikod</translation>
+    </message>
+</context>
+<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">- Launcher</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Brak aplikacji</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p&gt;Brak aplikacji zdefiniowanych dla tego dokumentu.&lt;p&gt; Typ to %1.</translation>
     </message>
     <message>
-        <source>Finding documents</source>
-        <translation type="unfinished"></translation>
+        <source>Documents</source>
+        <translation type="unfinished">Dokumenty</translation>
     </message>
     <message>
-        <source>Searching documents</source>
-        <translation type="unfinished"></translation>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished">Pokaz jako tekst</translation>
     </message>
 </context>
 <context>
-    <name>LauncherView</name>
+    <name>LauncherTabWidget</name>
     <message>
-        <source>%1 files</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation type="unfinished">&lt;b&gt;Wyszukiwanie Dokumentow...&lt;/b&gt;</translation>
     </message>
     <message>
-        <source>All types of file</source>
-        <translation type="unfinished"></translation>
+        <source>Icon View</source>
+        <translation type="unfinished">Pokazuj ikony</translation>
     </message>
     <message>
+        <source>List View</source>
+        <translation type="unfinished">Pokazuj liste</translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
         <source>Document View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Widok Dokumentu</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished">Wszystkie typy</translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
+    <name>SafeMode</name>
     <message>
-        <source>Medium inserted</source>
-        <translation type="unfinished"></translation>
+        <source>Safe Mode</source>
+        <translation type="unfinished">Tryb bezpieczny</translation>
     </message>
     <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="unfinished"></translation>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished">Menadzer wtyczek...</translation>
     </message>
     <message>
-        <source>Which media files</source>
-        <translation type="unfinished"></translation>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished">Restartuj Qtopie</translation>
     </message>
     <message>
-        <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <source>Help...</source>
+        <translation type="unfinished">Pomoc...</translation>
     </message>
+</context>
+<context>
+    <name>ServerApplication</name>
     <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
+        <source>Information</source>
+        <translation type="unfinished">Informacje</translation>
     </message>
     <message>
-        <source>Text</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Data systemowa wydaje sie byc nieprawidlowa.
+(%1)&lt;/p&gt;&lt;p&gt;Czy chcesz poprawic zegar?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Video</source>
-        <translation type="unfinished"></translation>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">Poziom energii jest krytyczny!
+Wylacz urzadzenie az do naladowania baterii!</translation>
     </message>
     <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished">Poziom energii bardzo niski.</translation>
     </message>
     <message>
-        <source>Link apps</source>
-        <translation type="unfinished"></translation>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">Bateria zapasowa sie rozladowuje.
+Doladuj baterie zapasowa.</translation>
     </message>
     <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="unfinished"></translation>
+        <source>business card</source>
+        <translation type="unfinished">wizytowka</translation>
     </message>
     <message>
-        <source>Add</source>
-        <translation type="unfinished"></translation>
+        <source>Safe Mode</source>
+        <translation type="unfinished">Tryb Bezpieczny</translation>
     </message>
     <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished">&lt;P&gt;Wystapil blad systemu i jest on teraz w Trybie Bezpiecznym. W tym trybie nie sa ladowane wtyczki. Uzywajac Menadzera Wtyczek mozesz wylaczyc wtyczki, ktore powoduja awarie systemu.</translation>
     </message>
     <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="unfinished"></translation>
+        <source>OK</source>
+        <translation type="unfinished">OK</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Battery Status</source>
-        <translation type="unfinished"></translation>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished">Menadzer Wtyczek...</translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished">Stan Pamieci</translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished">Malo Pamieci
+Zapisz dane.</translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished">Krytyczny Brak Pamieci
+Zakoncz natychmiast 
+ta aplikacje.</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zamknij</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zamknij Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Restartuj system</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Restartuj Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zamknij system</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p&gt;
+Te opcje zamykajace zostaly pierwotnie dodane do uzytku deweloperow i dla testow Opie. W normalnym srodowisku ich uzywanie nie jest konieczne.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zamykanie systemu...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Polaczenie Synchronizacyjne</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p&gt;Nieautoryzowany system zada dostepu do tego urzadzenia.&lt;p&gt;Jesli uzywasz Qtopia Desktop w wersji wczesniejszej niz 1.5.1, zaktualizuj ja.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Odmow</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;p&gt;Nierozpoznany system zada dostepu do tego urzadzenia.&lt;p&gt;Jesli zainicjowales Synchronizacje po raz pierwszy  to jest to normalne.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Zezwol</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <source>Abort</source>
+        <translation type="unfinished">Przerwij</translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <source>Syncing:</source>
+        <translation type="unfinished">Synchronizacja:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/remote.ts b/i18n/pl/remote.ts
index 0314a85..d9a539c 100644
--- a/i18n/pl/remote.ts
+++ b/i18n/pl/remote.ts
@@ -3,19 +3,19 @@
     <name>MainView</name>
     <message>
         <source>Remote</source>
-        <translation type="unfinished"></translation>
+        <translation>Pilot</translation>
     </message>
     <message>
         <source>Learn</source>
-        <translation type="unfinished"></translation>
+        <translation>Ucz</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguracja</translation>
     </message>
     <message>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Pomoc</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/sheetqt.ts b/i18n/pl/sheetqt.ts
index 6a05307..f9b0b84 100644
--- a/i18n/pl/sheetqt.ts
+++ b/i18n/pl/sheetqt.ts
@@ -3,641 +3,641 @@
     <name>CellFormat</name>
     <message>
         <source>&amp;Borders</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ramki</translation>
     </message>
     <message>
         <source>Back&amp;ground</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tlo</translation>
     </message>
     <message>
         <source>&amp;Font</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Czcionka</translation>
     </message>
     <message>
         <source>&amp;Alignment</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Polozenie</translation>
     </message>
     <message>
         <source>&amp;Width:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Szerokosc:</translation>
     </message>
     <message>
         <source>&amp;Color:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kolor:</translation>
     </message>
     <message>
         <source>&amp;Default Borders</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Domyslne ramki</translation>
     </message>
     <message>
         <source>&amp;Style:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Styl:</translation>
     </message>
     <message>
         <source>&amp;Default Background</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Domyslne tlo</translation>
     </message>
     <message>
         <source>&amp;Font:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Czcionka:</translation>
     </message>
     <message>
         <source>&amp;Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rozmiar:</translation>
     </message>
     <message>
         <source>&amp;Bold</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pogrubiona</translation>
     </message>
     <message>
         <source>&amp;Italic</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pochyla</translation>
     </message>
     <message>
         <source>&amp;Default Font</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Domyslna czcionka</translation>
     </message>
     <message>
         <source>&amp;Vertical:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pionowo:</translation>
     </message>
     <message>
         <source>&amp;Horizontal:</source>
-        <translation type="unfinished"></translation>
+        <translation>Po&amp;ziomo:</translation>
     </message>
     <message>
         <source>&amp;Word Wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zawijanie slow</translation>
     </message>
     <message>
         <source>&amp;Default Alignment</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Domyslne polozenie</translation>
     </message>
     <message>
         <source>Format Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Formatuj komorki</translation>
     </message>
     <message>
         <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Sheet</translation>
     </message>
 </context>
 <context>
     <name>FindDialog</name>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Znajdz i Zastap</translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Opcje</translation>
     </message>
     <message>
         <source>&amp;Search for:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Szukaj:</translation>
     </message>
     <message>
         <source>&amp;Replace with:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zastap:</translation>
     </message>
     <message>
         <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Typ</translation>
     </message>
     <message>
         <source>&amp;Find</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Znajsz</translation>
     </message>
     <message>
         <source>&amp;Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zastap</translation>
     </message>
     <message>
         <source>Replace &amp;all</source>
-        <translation type="unfinished"></translation>
+        <translation>Zastap &amp;wszystkie</translation>
     </message>
     <message>
         <source>Match &amp;case</source>
-        <translation type="unfinished"></translation>
+        <translation>Dopasuj wielkosc &amp;liter</translation>
     </message>
     <message>
         <source>Current &amp;selection only</source>
-        <translation type="unfinished"></translation>
+        <translation>Tylko &amp;zaznaczenie</translation>
     </message>
     <message>
         <source>&amp;Entire cell</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cala komorka</translation>
     </message>
     <message>
         <source>Find &amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajdz &amp; Zastap</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Sheet</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad niespojnosci!</translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik nie moze byc zapisany!</translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik nie moze byc otworzony!</translation>
     </message>
     <message>
         <source>Invalid file format!</source>
-        <translation type="unfinished"></translation>
+        <translation>Zly format pliku!</translation>
     </message>
     <message>
         <source>Save File</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz Plik</translation>
     </message>
     <message>
         <source>Do you want to save the current file?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy chcesz zapisac aktualny plik?</translation>
     </message>
     <message>
         <source>&amp;File Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nazwa pliku:</translation>
     </message>
     <message>
         <source>UnnamedFile</source>
-        <translation type="unfinished"></translation>
+        <translation>NienazwanyPlik</translation>
     </message>
     <message>
         <source>New File</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy Plik</translation>
     </message>
     <message>
         <source>&amp;New</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Nowy</translation>
     </message>
     <message>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>Otworz Plik</translation>
     </message>
     <message>
         <source>&amp;Open</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Otworz</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zapisz</translation>
     </message>
     <message>
         <source>Save File As</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz Plik Jako</translation>
     </message>
     <message>
         <source>Save &amp;As</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz &amp;Jako</translation>
     </message>
     <message>
         <source>Accept</source>
-        <translation type="unfinished"></translation>
+        <translation>Akceptuj</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Akceptuj</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>A&amp;nuluj</translation>
     </message>
     <message>
         <source>Cell Selector</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybor Komorki</translation>
     </message>
     <message>
         <source>Cell &amp;Selector</source>
-        <translation type="unfinished"></translation>
+        <translation>Wy&amp;bor Komorki</translation>
     </message>
     <message>
         <source>Cut Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Wytnij Komorki</translation>
     </message>
     <message>
         <source>Cu&amp;t</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wytnij</translation>
     </message>
     <message>
         <source>Copy Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Kopiuj Komorki</translation>
     </message>
     <message>
         <source>&amp;Copy</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kopiuj</translation>
     </message>
     <message>
         <source>Paste Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Wklej Komorki</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
-        <translation type="unfinished"></translation>
+        <translation>Wk&amp;lej</translation>
     </message>
     <message>
         <source>Paste Contents</source>
-        <translation type="unfinished"></translation>
+        <translation>Wklej Zawartosc</translation>
     </message>
     <message>
         <source>Paste Cont&amp;ents</source>
-        <translation type="unfinished"></translation>
+        <translation>Wklej &amp;Zawartosc</translation>
     </message>
     <message>
         <source>Clear Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Czysc Komorki</translation>
     </message>
     <message>
         <source>C&amp;lear</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Czysc</translation>
     </message>
     <message>
         <source>Insert Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Wstaw Komorki</translation>
     </message>
     <message>
         <source>C&amp;ells</source>
-        <translation type="unfinished"></translation>
+        <translation>Ko&amp;morki</translation>
     </message>
     <message>
         <source>Insert Rows</source>
-        <translation type="unfinished"></translation>
+        <translation>Wstaw Wiersze</translation>
     </message>
     <message>
         <source>&amp;Rows</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wiersze</translation>
     </message>
     <message>
         <source>Insert Columns</source>
-        <translation type="unfinished"></translation>
+        <translation>Wstaw Kolumny</translation>
     </message>
     <message>
         <source>&amp;Columns</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kolumny</translation>
     </message>
     <message>
         <source>Add Sheets</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj Arkusze</translation>
     </message>
     <message>
         <source>&amp;Sheets</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Arkusze</translation>
     </message>
     <message>
         <source>Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>Komorki</translation>
     </message>
     <message>
         <source>&amp;Cells</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Komorki</translation>
     </message>
     <message>
         <source>Row Height</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysokosc Wiersza</translation>
     </message>
     <message>
         <source>H&amp;eight</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wysokosc</translation>
     </message>
     <message>
         <source>Adjust Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Dostosuj Wiersz</translation>
     </message>
     <message>
         <source>&amp;Adjust</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dostosuj</translation>
     </message>
     <message>
         <source>Show Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz Wiersz</translation>
     </message>
     <message>
         <source>&amp;Show</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Pokaz</translation>
     </message>
     <message>
         <source>Hide Row</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukryj Wiersz</translation>
     </message>
     <message>
         <source>&amp;Hide</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ukryj</translation>
     </message>
     <message>
         <source>Column Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Szerokosc Kolumny</translation>
     </message>
     <message>
         <source>&amp;Width</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Szerokosc</translation>
     </message>
     <message>
         <source>Adjust Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Dostosuj Kolumne</translation>
     </message>
     <message>
         <source>Show Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz Kolumne</translation>
     </message>
     <message>
         <source>Hide Column</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukryj Kolumne</translation>
     </message>
     <message>
         <source>Rename Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmien Nazwe Arkusza</translation>
     </message>
     <message>
         <source>&amp;Rename</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zmien Nazwe</translation>
     </message>
     <message>
         <source>Remove Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun Arkusz</translation>
     </message>
     <message>
         <source>R&amp;emove</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Usun</translation>
     </message>
     <message>
         <source>Sort Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Sortuj Dane</translation>
     </message>
     <message>
         <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sortuj</translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>Znajdz i Zastap</translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Znajdz i Zastap</translation>
     </message>
     <message>
         <source>Equal To</source>
-        <translation type="unfinished"></translation>
+        <translation>Rowne</translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rowne</translation>
     </message>
     <message>
         <source>Addition</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodawanie</translation>
     </message>
     <message>
         <source>&amp;Addition</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dodawanie</translation>
     </message>
     <message>
         <source>Subtraction</source>
-        <translation type="unfinished"></translation>
+        <translation>Odejmowanie</translation>
     </message>
     <message>
         <source>&amp;Subtraction</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Odejmowanie</translation>
     </message>
     <message>
         <source>Multiplication</source>
-        <translation type="unfinished"></translation>
+        <translation>Mnozenie</translation>
     </message>
     <message>
         <source>&amp;Multiplication</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Mnozenie</translation>
     </message>
     <message>
         <source>Division</source>
-        <translation type="unfinished"></translation>
+        <translation>Dzielenie</translation>
     </message>
     <message>
         <source>&amp;Division</source>
-        <translation type="unfinished"></translation>
+        <translation>D&amp;zielenie</translation>
     </message>
     <message>
         <source>Open ParanthesistempCellData-&gt;row+row1, tempCellData-&gt;col+col1</source>
-        <translation type="unfinished"></translation>
+        <translation>Otworz Nawias</translation>
     </message>
     <message>
         <source>&amp;Open Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Otworz Nawias</translation>
     </message>
     <message>
         <source>Close Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij Nawias</translation>
     </message>
     <message>
         <source>&amp;Close Paranthesis</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zamknij Nawias</translation>
     </message>
     <message>
         <source>Comma</source>
-        <translation type="unfinished"></translation>
+        <translation>Przecinek</translation>
     </message>
     <message>
         <source>&amp;Comma</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Przecinek</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>P&amp;lik</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Edytuj</translation>
     </message>
     <message>
         <source>&amp;Insert</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wstaw</translation>
     </message>
     <message>
         <source>&amp;Format</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Formatuj</translation>
     </message>
     <message>
         <source>&amp;Data</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dane</translation>
     </message>
     <message>
         <source>&amp;Row</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wiersz</translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kolumna</translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Arkusz</translation>
     </message>
     <message>
         <source>&amp;Function</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Funkcja</translation>
     </message>
     <message>
         <source>&amp;Standard</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Standard</translation>
     </message>
     <message>
         <source>Summation</source>
-        <translation type="unfinished"></translation>
+        <translation>Suma</translation>
     </message>
     <message>
         <source>&amp;Summation</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Suma</translation>
     </message>
     <message>
         <source>Absolute Value</source>
-        <translation type="unfinished"></translation>
+        <translation>Wartosc Bezwzgledna</translation>
     </message>
     <message>
         <source>&amp;Absolute</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Bezwzgledna</translation>
     </message>
     <message>
         <source>Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>Sinus</translation>
     </message>
     <message>
         <source>Si&amp;ne</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sinus</translation>
     </message>
     <message>
         <source>Arc Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>Arcus Sinus</translation>
     </message>
     <message>
         <source>A&amp;rc Sine</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Arcus Sinus</translation>
     </message>
     <message>
         <source>Cosine</source>
-        <translation type="unfinished"></translation>
+        <translation>Cosinus</translation>
     </message>
     <message>
         <source>&amp;Cosine</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Cosinus</translation>
     </message>
     <message>
         <source>ArcCosine</source>
-        <translation type="unfinished"></translation>
+        <translation>Arcus Cosinus</translation>
     </message>
     <message>
         <source>Arc Cos&amp;ine</source>
-        <translation type="unfinished"></translation>
+        <translation>A&amp;rcus Cosinus</translation>
     </message>
     <message>
         <source>Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>Tangens</translation>
     </message>
     <message>
         <source>&amp;Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Tangens</translation>
     </message>
     <message>
         <source>Arc Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>Arcus Tangens</translation>
     </message>
     <message>
         <source>Arc Tan&amp;gent</source>
-        <translation type="unfinished"></translation>
+        <translation>Arc&amp;us Tangens</translation>
     </message>
     <message>
         <source>Arc Tangent of Coordinates</source>
-        <translation type="unfinished"></translation>
+        <translation>Arcus Tangens Wspolrzednych</translation>
     </message>
     <message>
         <source>C&amp;oor. Arc Tangent</source>
-        <translation type="unfinished"></translation>
+        <translation>Arcus Tangens &amp;Wsp</translation>
     </message>
     <message>
         <source>Exponential</source>
-        <translation type="unfinished"></translation>
+        <translation>Ekspotencjal</translation>
     </message>
     <message>
         <source>&amp;Exponential</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Ekspotencjal</translation>
     </message>
     <message>
         <source>Logarithm</source>
-        <translation type="unfinished"></translation>
+        <translation>Logarytm</translation>
     </message>
     <message>
         <source>&amp;Logarithm</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Logarytm</translation>
     </message>
     <message>
         <source>Power</source>
-        <translation type="unfinished"></translation>
+        <translation>Potega</translation>
     </message>
     <message>
         <source>&amp;Power</source>
-        <translation type="unfinished"></translation>
+        <translation>Pote&amp;ga</translation>
     </message>
     <message>
         <source>&amp;Mathematical</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Matematyczne</translation>
     </message>
     <message>
         <source>Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Srednia</translation>
     </message>
     <message>
         <source>&amp;Average</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Srednia</translation>
     </message>
     <message>
         <source>Maximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Maksimum</translation>
     </message>
     <message>
         <source>Ma&amp;ximum</source>
-        <translation type="unfinished"></translation>
+        <translation>Ma&amp;ksimum</translation>
     </message>
     <message>
         <source>Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>Minimum</translation>
     </message>
     <message>
         <source>&amp;Minimum</source>
-        <translation type="unfinished"></translation>
+        <translation>Mi&amp;nimum</translation>
     </message>
     <message>
         <source>Count</source>
-        <translation type="unfinished"></translation>
+        <translation>Liczba</translation>
     </message>
     <message>
         <source>&amp;Count</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Liczba</translation>
     </message>
     <message>
         <source>&amp;Statistical</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Statystyczne</translation>
     </message>
     <message>
         <source>Functions</source>
-        <translation type="unfinished"></translation>
+        <translation>Funkcje</translation>
     </message>
     <message>
         <source>About Opie Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>O Opie Sheet</translation>
     </message>
     <message>
         <source>Opie Sheet
@@ -651,137 +651,147 @@ Release Date: October 08, 2002
 This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
 
 http://qtopia.sitebest.com</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Sheet
+Arkusz Kalkulacyjny dla Opie
+Beta Zwyciezca QWDC (jako Sheet/Qt)
+
+Rozwijany przez: Serdar Ozler
+Wydanie 1.0.2
+Data Wydania: 8 Pazdziernika 2002
+
+Produkt ten podlega licencji GPL. Mozna go swobodnie dystrybuowac. Jesli szukasz najnowszej wersji lub kodu zrodlowego odwiedz strone WWW.
+
+http://qtopia.sitebest.com</translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Liczba wierszy:</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Liczba kolumn:</translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Liczba arkuszy:</translation>
     </message>
     <message>
         <source>Sheet</source>
-        <translation type="unfinished"></translation>
+        <translation>Arkusz</translation>
     </message>
     <message>
         <source>&amp;Height of each row:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wysokosc kazdego wiersza:</translation>
     </message>
     <message>
         <source>&amp;Width of each column:</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Szerokosc kazdej kolumny:</translation>
     </message>
     <message>
         <source>&amp;Sheet Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa &amp;Arkusza:</translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
-        <translation type="unfinished"></translation>
+        <translation>Jest tylko jeden arkusz!</translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy jestes pewien?</translation>
     </message>
     <message>
         <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Typ</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
-        <translation type="unfinished"></translation>
+        <translation>Przesun komorki w &amp;dol</translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
-        <translation type="unfinished"></translation>
+        <translation>Przesun komorki w &amp;prawo</translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
-        <translation type="unfinished"></translation>
+        <translation>Caly &amp;wiersz</translation>
     </message>
     <message>
         <source>Entire &amp;column</source>
-        <translation type="unfinished"></translation>
+        <translation>Cala &amp;kolumna</translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>Syntax error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad Skladni!</translation>
     </message>
     <message>
         <source>Search key not found!</source>
-        <translation type="unfinished"></translation>
+        <translation>Poszukiwany ciag nie znaleziony!</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sortuj</translation>
     </message>
     <message>
         <source>&amp;Options</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Opcje</translation>
     </message>
     <message>
         <source>&amp;Sort by</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Portuj po</translation>
     </message>
     <message>
         <source>&amp;Then by</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Potem po</translation>
     </message>
     <message>
         <source>Then &amp;by</source>
-        <translation type="unfinished"></translation>
+        <translation>Potem p&amp;o</translation>
     </message>
     <message>
         <source>&amp;Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rozroznianie wielkosci liter</translation>
     </message>
     <message>
         <source>&amp;Direction</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Kierunek</translation>
     </message>
     <message>
         <source>&amp;Top to bottom (rows)</source>
-        <translation type="unfinished"></translation>
+        <translation>Z &amp;gory na dol (wiersze)</translation>
     </message>
     <message>
         <source>&amp;Left to right (columns)</source>
-        <translation type="unfinished"></translation>
+        <translation>Z &amp;lewej do prawej (kolumny)</translation>
     </message>
     <message>
         <source>Sort</source>
-        <translation type="unfinished"></translation>
+        <translation>Sortuj</translation>
     </message>
     <message>
         <source>&amp;Ascending</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Rosnaco</translation>
     </message>
     <message>
         <source>&amp;Descending</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Malejaco</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>One cell cannot be sorted!</source>
-        <translation type="unfinished"></translation>
+        <translation>Jedna komorka nie moze zostac posortowna!</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/showimg.ts b/i18n/pl/showimg.ts
index e0a99ea..8bce1c2 100644
--- a/i18n/pl/showimg.ts
+++ b/i18n/pl/showimg.ts
@@ -3,18 +3,18 @@
     <name>ControlsDialog</name>
     <message>
         <source>Brightness</source>
-        <translation type="unfinished"></translation>
+        <translation>Jasnosc</translation>
     </message>
 </context>
 <context>
     <name>ImageFileSelector</name>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Tytul</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ</translation>
     </message>
 </context>
 <context>
@@ -25,7 +25,7 @@
     </message>
     <message>
         <source>Horizontal flip</source>
-        <translation>Odbicie oiziome</translation>
+        <translation>Odbicie poziome</translation>
     </message>
     <message>
         <source>Vertical flip</source>
@@ -53,106 +53,133 @@
     </message>
     <message>
         <source> True color</source>
-        <translation> Pelny kolor</translation>
+        <translation>True color</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Widok</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
+        <translation>Widok Miniaturek</translation>
     </message>
     <message>
         <source>Preferences..</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia..</translation>
     </message>
     <message>
         <source>Image Info ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacje o Zdjeciu ...</translation>
     </message>
     <message>
         <source>Open ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Otworz ...</translation>
     </message>
     <message>
         <source>Rotate 270</source>
-        <translation type="unfinished">Obroc o 270</translation>
+        <translation>Obroc o 270</translation>
     </message>
     <message>
         <source>Brightness ...</source>
-        <translation type="unfinished"></translation>
+        <translation>Jasnosc ...</translation>
     </message>
     <message>
         <source>Black And White</source>
-        <translation type="unfinished"></translation>
+        <translation>Czarno-bialy</translation>
     </message>
     <message>
         <source>Scale to Screen</source>
-        <translation type="unfinished"></translation>
+        <translation>Skaluj do ekranu</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcje</translation>
     </message>
     <message>
         <source>%1 colors</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kolorow</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 poziomow alfa</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
-        <translation type="unfinished"></translation>
+        <translation>8-bitowy kanal alfa</translation>
     </message>
     <message>
         <source>Slide show</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz slajdow</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
-        <translation type="unfinished"></translation>
+        <translation>Zatrzymaj pokaz</translation>
+    </message>
+</context>
+<context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation>Nazwa Pliku</translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation>Format</translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation>Rozmiar Pliku</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Rozmiar</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation>Kolory</translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation>Alfa</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia</translation>
     </message>
     <message>
         <source>Slide Show</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz Slajdow</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
-        <translation type="unfinished"></translation>
+        <translation>Opoznienie pomieszy zdjeciami</translation>
     </message>
     <message>
         <source>s</source>
-        <translation type="unfinished"></translation>
+        <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
-        <translation type="unfinished"></translation>
+        <translation>Powtorz pokaz</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokazuj zdjecia odwrocone</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
-        <translation type="unfinished"></translation>
+        <translation>Laduj zdjecia obrocone o 90 stopni</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
-        <translation type="unfinished"></translation>
+        <translation>Szybkie ladownie zdjec</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/snake.ts b/i18n/pl/snake.ts
index 9a27b3a..a4d7154 100644
--- a/i18n/pl/snake.ts
+++ b/i18n/pl/snake.ts
@@ -17,9 +17,9 @@
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
-        <translation>Uzywaj klawiszy strzalek do poruszania
-weza i jedzenia myszek. Musisz
-nie wpadac na sciany i przeszkody</translation>
+        <translation>Uzywaj klawiszy strzalek do kierowania
+wezem tak by zjadal myszy. Nie mozesz
+wpadac na sciany, krawedzie i swoj ogon.</translation>
     </message>
     <message>
         <source>Press Any Key To Start</source>
@@ -41,11 +41,11 @@ nie wpadac na sciany i przeszkody</translation>
     </message>
     <message>
         <source>Press any key to start</source>
-        <translation type="unfinished"></translation>
+        <translation>Wcisnij dowolny przycisk by zaczac</translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wcisnij dowolny przycisk by zaczac nowa gre.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/sound.ts b/i18n/pl/sound.ts
index 559bf2b..365190a 100644
--- a/i18n/pl/sound.ts
+++ b/i18n/pl/sound.ts
@@ -3,54 +3,54 @@
     <name>SoundSettings</name>
     <message>
         <source>Shows icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokazuje ikone</translation>
     </message>
     <message>
         <source>Hides icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukrywa ikone</translation>
     </message>
 </context>
 <context>
     <name>SoundSettingsBase</name>
     <message>
         <source>11025</source>
-        <translation type="unfinished"></translation>
+        <translation>11025</translation>
     </message>
     <message>
         <source>22050</source>
-        <translation type="unfinished"></translation>
+        <translation>22050</translation>
     </message>
     <message>
         <source>44100</source>
-        <translation type="unfinished"></translation>
+        <translation>44100</translation>
     </message>
     <message>
         <source>Stereo</source>
-        <translation type="unfinished"></translation>
+        <translation>Stereo</translation>
     </message>
     <message>
         <source>16 bit</source>
-        <translation type="unfinished"></translation>
+        <translation>16 bitow</translation>
     </message>
     <message>
         <source>Vmemo Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia Vmemo</translation>
     </message>
     <message>
         <source>8000</source>
-        <translation type="unfinished"></translation>
+        <translation>8000</translation>
     </message>
     <message>
         <source>33075</source>
-        <translation type="unfinished"></translation>
+        <translation>33075</translation>
     </message>
     <message>
         <source>Visual Alerts</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarmy Wizualne</translation>
     </message>
     <message>
         <source>Taskbar Icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Ikona w pasku zadan</translation>
     </message>
     <message>
         <source>Key_Space</source>
@@ -78,47 +78,47 @@
     </message>
     <message>
         <source>30</source>
-        <translation type="unfinished"></translation>
+        <translation>30</translation>
     </message>
     <message>
         <source>20</source>
-        <translation type="unfinished"></translation>
+        <translation>20</translation>
     </message>
     <message>
         <source>15</source>
-        <translation type="unfinished"></translation>
+        <translation>15</translation>
     </message>
     <message>
         <source>10</source>
-        <translation type="unfinished"></translation>
+        <translation>10</translation>
     </message>
     <message>
         <source>5</source>
-        <translation type="unfinished"></translation>
+        <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
-        <translation type="unfinished"></translation>
+        <translation>Probkowanie:</translation>
     </message>
     <message>
         <source>Recording Directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>Katalog Nagrania:</translation>
     </message>
     <message>
         <source>Recording Key:</source>
-        <translation type="unfinished"></translation>
+        <translation>Przycisk Nagrywania:</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
-        <translation type="unfinished"></translation>
+        <translation>Limit Nagrania w sekundach:</translation>
     </message>
     <message>
         <source>Unlimited</source>
-        <translation type="unfinished"></translation>
+        <translation>Nielimitowane</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
-        <translation type="unfinished"></translation>
+        <translation>Restartuj Opie w razie potrzeby</translation>
     </message>
     <message>
         <source>Key_Record</source>
diff --git a/i18n/pl/stockticker.ts b/i18n/pl/stockticker.ts
index 53c65ee..e479694 100644
--- a/i18n/pl/stockticker.ts
+++ b/i18n/pl/stockticker.ts
@@ -3,66 +3,66 @@
     <name>HelpWindow</name>
     <message>
         <source>&amp;Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Otworz Plik</translation>
     </message>
     <message>
         <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Zamknij</translation>
     </message>
     <message>
         <source>&amp;Backward</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Wstecz</translation>
     </message>
     <message>
         <source>&amp;Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Dalej</translation>
     </message>
     <message>
         <source>&amp;Home</source>
-        <translation type="unfinished"></translation>
+        <translation>Do&amp;m</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj Zakladke</translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Plik</translation>
     </message>
     <message>
         <source>&amp;Go</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Idz</translation>
     </message>
     <message>
         <source>History</source>
-        <translation type="unfinished"></translation>
+        <translation>Historia</translation>
     </message>
     <message>
         <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
+        <translation>Zakladki</translation>
     </message>
     <message>
         <source>Backward</source>
-        <translation type="unfinished"></translation>
+        <translation>Wstecz</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation>Dalej</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished"></translation>
+        <translation>Dom</translation>
     </message>
 </context>
 <context>
     <name>InputDialog</name>
     <message>
         <source>Symbol Lookup</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyszukiwanie Symbolu</translation>
     </message>
     <message>
         <source>Enter something to lookup / search.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz cos do wyszukania.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/sysinfo.ts b/i18n/pl/sysinfo.ts
index a86516d..1d50f1c 100644
--- a/i18n/pl/sysinfo.ts
+++ b/i18n/pl/sysinfo.ts
@@ -3,58 +3,58 @@
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
-        <translation type="unfinished"></translation>
+        <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tej karcie Compact Flash.</translation>
     </message>
     <message>
         <source>Ha</source>
-        <translation type="unfinished"></translation>
+        <translation>Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tym twardym dysku.</translation>
     </message>
     <message>
         <source>SD</source>
-        <translation type="unfinished"></translation>
+        <translation>SD</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tej karcie Secure Digital.</translation>
     </message>
     <message>
         <source>SC</source>
-        <translation type="unfinished"></translation>
+        <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten wykres reprezentuje aktualne uzycie pamieci w pamieci wbudowanej tego urzadzenia (np. pamieci Flash).</translation>
     </message>
     <message>
         <source>RA</source>
-        <translation type="unfinished"></translation>
+        <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten wykres reprezentuje aktualne uzycie pamieci na tymczasowym RAM-dysku.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
-        <translation>Aplikacje CPU (%)</translation>
+        <translation>Uzycie procesora przez aplikacje (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
-        <translation>System CPU (%)</translation>
+        <translation>Uzycie procesora przez system (%)</translation>
     </message>
     <message>
         <source>Type: </source>
@@ -62,14 +62,14 @@
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta strona prezentuje obciazenie procesora tego urzadzenia.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
-        <translation>Uzywane (%1 kB)</translation>
+        <translation>Uzywana (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
@@ -81,11 +81,11 @@
     </message>
     <message>
         <source>Free (%1 kB)</source>
-        <translation>Wolne (%1 kB)</translation>
+        <translation>Wolna (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
-        <translation>Calkowita: %1 kB</translation>
+        <translation>Calkowita Pamiec: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
@@ -95,82 +95,90 @@ Memory is categorized as follows:
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta strona prezentuje alokacje pamieci (np. RAM) na Twoim urzadzeniu.
+Pamiec jest podzielona na kategorie:
+
+1. Uzywana - pamiec uzywana przez Opie i inne dzialajace aplikacje.
+2. Bufory - tymczasowa przestrzen uzywana do poprawienia wydajnosci.
+3. Podreczna - informacje, ktore zostaly juz uzyte, ale nie zostaly jeszcze zwolnione.
+4. Wolna - pamiec nie bedaca aktualnie w uzyciu przez zadne aplikacje.</translation>
     </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
-        <translation type="unfinished"></translation>
+        <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Use#</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzyty#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
-        <translation type="unfinished"></translation>
+        <translation>To jest lista wszystkich aktualnie zaladowanych modulow jadra.
+
+Kliknij i przytrzymaj na module aby zobaczyc wiecej informacji na jego temat lub wy go usunac z pamieci.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz tu polecenie i kliknij przycisk Wyslij po prawej zeby wyslac polecenie do wybranego powyzej modulu.</translation>
     </message>
     <message>
         <source>Send</source>
-        <translation type="unfinished">Wyslane</translation>
+        <translation>Wyslij</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby wyslac wybrane polecenie do wybranego powyzej modulu.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten obszar prezentuje szczegolowe informacje o tym module.</translation>
     </message>
     <message>
         <source>Used by</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzywany przez</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno chcesz wykonac %1 na tym module?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
-        <translation>Uzywane (%1 kB)</translation>
+        <translation>Zajete (%1 kB)</translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
-        <translation>Dostepne (%1 kB)</translation>
+        <translation>Wolne (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
-        <translation type="unfinished"></translation>
+        <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
-        <translation type="unfinished"></translation>
+        <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Komenda</translation>
+        <translation>polecenie</translation>
     </message>
     <message>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
@@ -180,27 +188,29 @@ Click and hold on a module to see additional information about the module, or to
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
-        <translation type="unfinished"></translation>
+        <translation>To jest lista wszystkich procesow dzialajacych na tym urzadzeniu.
+
+Kliknij i przytrzymaj na procesie by zobaczyc dodatkowe informacje o nim lub by wyslac do niego sygnal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz tu sygnal i kliknij przycisk Wyslij po prawej by go wyslac do procesu.</translation>
     </message>
     <message>
         <source>Send</source>
-        <translation type="unfinished">Wyslane</translation>
+        <translation>Wyslij</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu by wyslac wybrany sygnal do tego procesu.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ten obszar prezentuje szczegolowe informacje o tym procesie.</translation>
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno chcesz wyslac %1 do tego procesu?</translation>
     </message>
 </context>
 <context>
@@ -219,7 +229,7 @@ Click and hold on a process to see additional information about the process, or
     </message>
     <message>
         <source>CPU</source>
-        <translation type="unfinished"></translation>
+        <translation>Procesor</translation>
     </message>
     <message>
         <source>Process</source>
@@ -227,22 +237,22 @@ Click and hold on a process to see additional information about the process, or
     </message>
     <message>
         <source>Version</source>
-        <translation>Versja</translation>
+        <translation>Wersja</translation>
     </message>
     <message>
         <source>Modules</source>
-        <translation type="unfinished"></translation>
+        <translation>Moduly</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
-        <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Wersja: </translation>
+        <translation>&lt;b&gt;Jadro Linuksa&lt;/b&gt;&lt;p&gt;Wersja: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
-        <translation>Kompilowana przez: </translation>
+        <translation>Kompilowane przez: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
@@ -250,23 +260,23 @@ Click and hold on a process to see additional information about the process, or
     </message>
     <message>
         <source>Built on: </source>
-        <translation>Utworzona: </translation>
+        <translation>Zbudowane na: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Wersja:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Model:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;Sprzedawca:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ta strona prezentuje aktualne wersje Opie, jadra Linuksa i dystrybucji dzialajacych na tym urzadzeniu.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/systemtime.ts b/i18n/pl/systemtime.ts
index 2259c4a..9254219 100644
--- a/i18n/pl/systemtime.ts
+++ b/i18n/pl/systemtime.ts
@@ -3,240 +3,242 @@
     <name>FormatTabWidget</name>
     <message>
         <source>Time format</source>
-        <translation type="unfinished">Format czasu</translation>
+        <translation>Format czasu</translation>
     </message>
     <message>
         <source>hh:mm</source>
-        <translation type="unfinished">gg:mm</translation>
+        <translation>gg:mm</translation>
     </message>
     <message>
         <source>D/M hh:mm</source>
-        <translation type="unfinished">D/M gg:mm</translation>
+        <translation>D/M gg:mm</translation>
     </message>
     <message>
         <source>M/D hh:mm</source>
-        <translation type="unfinished"></translation>
+        <translation>M/D gg:mm</translation>
     </message>
     <message>
         <source>12/24 hour</source>
-        <translation type="unfinished">12/24 godzin</translation>
+        <translation>12/24 godzin</translation>
     </message>
     <message>
         <source>24 hour</source>
-        <translation type="unfinished">24 godziny</translation>
+        <translation>24 godziny</translation>
     </message>
     <message>
         <source>12 hour</source>
-        <translation type="unfinished">12 godzin</translation>
+        <translation>12 godzin</translation>
     </message>
     <message>
         <source>Date format</source>
-        <translation type="unfinished">Format daty</translation>
+        <translation>Format daty</translation>
     </message>
     <message>
         <source>Weeks start on</source>
-        <translation type="unfinished">Tydzien zaczyna sie w</translation>
+        <translation>Tydzien zaczyna sie w</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation type="unfinished">Niedziele</translation>
+        <translation>Niedziele</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation type="unfinished">Poniedzialek</translation>
+        <translation>Poniedzialek</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>SystemTime</source>
-        <translation type="unfinished"></translation>
+        <translation>SystemTime</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Czas</translation>
     </message>
     <message>
         <source>Format</source>
-        <translation type="unfinished"></translation>
+        <translation>Format</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia</translation>
     </message>
     <message>
         <source>Predict</source>
-        <translation type="unfinished"></translation>
+        <translation>Przewiduj</translation>
     </message>
     <message>
         <source>Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontynuowac?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
-        <translation type="unfinished"></translation>
+        <translation>Uruchamiam:
+ntpdate</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad</translation>
     </message>
     <message>
         <source>Error while getting time from network.</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad podczas pobierania czasu z sieci.</translation>
     </message>
     <message>
         <source>Error while executing ntpdate</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad podczas uruchamiania ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer Czasu</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
-        <translation type="unfinished"></translation>
+        <translation>Blad podczas pobierania czasu
+z serwera:</translation>
     </message>
     <message>
         <source>Could not connect to server </source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna polaczyc sie z serwerem</translation>
     </message>
     <message>
         <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="unfinished"></translation>
+        <translation>Prosiles o opoznienie %1 minut, ale od ostatniego sprawdzania minelo tylko %2 minut.&lt;br&gt;Kontynuowac?</translation>
     </message>
     <message>
         <source>%1 seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 sekund</translation>
     </message>
 </context>
 <context>
     <name>NTPTabWidget</name>
     <message>
         <source>Start time</source>
-        <translation type="unfinished"></translation>
+        <translation>Czas poczatkowy</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>brak</translation>
     </message>
     <message>
         <source>Time shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Przesuniecie czasu</translation>
     </message>
     <message>
         <source>New time</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy czas</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Pobierz czas z sieci</translation>
     </message>
 </context>
 <context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
-        <translation type="unfinished"></translation>
+        <translation>Przewidziany upływ czasu</translation>
     </message>
     <message>
         <source>n/a</source>
-        <translation type="unfinished"></translation>
+        <translation>brak</translation>
     </message>
     <message>
         <source>Estimated shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Oszacowane przesuniecie</translation>
     </message>
     <message>
         <source>Predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Przewidziany czas</translation>
     </message>
     <message>
         <source>Shift [s/h]</source>
-        <translation type="unfinished"></translation>
+        <translation>Pszesuniecie [s/g]</translation>
     </message>
     <message>
         <source>Last [h]</source>
-        <translation type="unfinished"></translation>
+        <translation>Ostatnia [g]</translation>
     </message>
     <message>
         <source>Offset [s]</source>
-        <translation type="unfinished"></translation>
+        <translation>Ofset [s]</translation>
     </message>
     <message>
         <source>Predict time</source>
-        <translation type="unfinished"></translation>
+        <translation>Przewiduj czas</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw przewidziany czas</translation>
     </message>
     <message>
         <source> s/h</source>
-        <translation type="unfinished"></translation>
+        <translation>s/g</translation>
     </message>
     <message>
         <source> seconds</source>
-        <translation type="unfinished"></translation>
+        <translation>sekundy</translation>
     </message>
 </context>
 <context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
-        <translation type="unfinished"></translation>
+        <translation>Serwer czasu</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minuty pomiedzy aktualizacjami czasu</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
-        <translation type="unfinished"></translation>
+        <translation>minuty pomiedzy aktualizacjami przewidywan</translation>
     </message>
     <message>
         <source>Display time server information</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz informacje o serwerze czasu</translation>
     </message>
     <message>
         <source>Display time prediction information</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz informacje o przewidywaniu czasu</translation>
     </message>
 </context>
 <context>
     <name>TimeTabWidget</name>
     <message>
         <source>Hour</source>
-        <translation type="unfinished">Godzin</translation>
+        <translation>Godzina</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation type="unfinished">Minuta</translation>
+        <translation>Minuta</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation type="unfinished"></translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished">Data</translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Time zone</source>
-        <translation type="unfinished"></translation>
+        <translation>Strefa czasowa</translation>
     </message>
     <message>
         <source>Get time from the network</source>
-        <translation type="unfinished"></translation>
+        <translation>Pobierz czas z sieci</translation>
     </message>
     <message>
         <source>Set predicted time</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw przewidziany czas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/tableviewer.ts b/i18n/pl/tableviewer.ts
index 7d41b6f..7b90316 100644
--- a/i18n/pl/tableviewer.ts
+++ b/i18n/pl/tableviewer.ts
@@ -14,11 +14,11 @@
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
-        <translation type="unfinished"></translation>
+        <translation>Przywroc</translation>
     </message>
     <message>
         <source>key</source>
-        <translation type="unfinished"></translation>
+        <translation>klucz</translation>
     </message>
 </context>
 <context>
@@ -29,41 +29,41 @@
     </message>
     <message>
         <source>Key Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa Klucza</translation>
     </message>
     <message>
         <source>Key Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ Klucza</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Clear All</source>
-        <translation type="unfinished"></translation>
+        <translation>Czysc Wszystkie</translation>
     </message>
 </context>
 <context>
     <name>TVListView</name>
     <message>
         <source>List View</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista</translation>
     </message>
 </context>
 <context>
     <name>TableViewerWindow</name>
     <message>
         <source>Table Viewer</source>
-        <translation type="unfinished"></translation>
+        <translation>Table Viewer</translation>
     </message>
     <message>
         <source>could not load Document</source>
-        <translation type="unfinished"></translation>
+        <translation>nie mozna zaladowac Dokumentu</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/tabmanager.ts b/i18n/pl/tabmanager.ts
index d544c39..7378b2e 100644
--- a/i18n/pl/tabmanager.ts
+++ b/i18n/pl/tabmanager.ts
@@ -3,85 +3,86 @@
     <name>AppEdit</name>
     <message>
         <source>Application</source>
-        <translation type="unfinished"></translation>
+        <translation>Aplikacja</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Icon:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ikona:</translation>
     </message>
     <message>
         <source>Exec:</source>
-        <translation type="unfinished"></translation>
+        <translation>Wykonaj:</translation>
     </message>
     <message>
         <source>Comment:</source>
-        <translation type="unfinished"></translation>
+        <translation>Komentarz:</translation>
     </message>
 </context>
 <context>
     <name>TabManager</name>
     <message>
         <source>Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiadomosc</translation>
     </message>
     <message>
         <source>Can&apos;t remove with applications
 still in the group.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna usunac z aplikacjami
+wciaz wewnatrz grupy.</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>Are you sure you want to delete?</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno usunac?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <source>Can&apos;t remove.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie mozna usunac.</translation>
     </message>
     <message>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Zakladka</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation type="unfinished"></translation>
+        <translation>Zbieranie ikon...</translation>
     </message>
     <message>
         <source>Application</source>
-        <translation type="unfinished"></translation>
+        <translation>Aplikacja</translation>
     </message>
 </context>
 <context>
     <name>TabManagerBase</name>
     <message>
         <source>Tab Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Meneger Zakladek</translation>
     </message>
     <message>
         <source>Hierarchy</source>
-        <translation type="unfinished"></translation>
+        <translation>Hierarchia</translation>
     </message>
 </context>
 <context>
     <name>Wait</name>
     <message>
         <source>Please Wait...</source>
-        <translation type="unfinished"></translation>
+        <translation>Prosze Czekac...</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/tetrix.ts b/i18n/pl/tetrix.ts
index 14c00e0..7b5bd26 100644
--- a/i18n/pl/tetrix.ts
+++ b/i18n/pl/tetrix.ts
@@ -3,41 +3,41 @@
     <name>OHighscore</name>
     <message>
         <source>empty</source>
-        <translation type="unfinished"></translation>
+        <translation>pusty</translation>
     </message>
     <message>
         <source>Enter your name!</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz swoje imie!</translation>
     </message>
 </context>
 <context>
     <name>OHighscoreDialog</name>
     <message>
         <source>Highscores</source>
-        <translation type="unfinished"></translation>
+        <translation>Wyniki</translation>
     </message>
     <message>
         <source>#</source>
-        <translation type="unfinished"></translation>
+        <translation>#</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Imie</translation>
     </message>
     <message>
         <source>Points</source>
-        <translation type="unfinished"></translation>
+        <translation>Punkty</translation>
     </message>
     <message>
         <source>Level</source>
-        <translation type="unfinished">Poziom</translation>
+        <translation>Poziom</translation>
     </message>
 </context>
 <context>
     <name>QTetrix</name>
     <message>
         <source>Tetrix</source>
-        <translation type="unfinished"></translation>
+        <translation>Tetrix</translation>
     </message>
     <message>
         <source>Next</source>
@@ -57,7 +57,7 @@
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished"></translation>
+        <translation>Start</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/textedit.ts b/i18n/pl/textedit.ts
index c7e18bb..a0d6c20 100644
--- a/i18n/pl/textedit.ts
+++ b/i18n/pl/textedit.ts
@@ -47,7 +47,7 @@
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Czcionka</translation>
     </message>
     <message>
         <source>Start with new file</source>
@@ -83,83 +83,83 @@
     </message>
     <message>
         <source>.desktop File</source>
-        <translation type="unfinished"></translation>
+        <translation>plik .desktop</translation>
     </message>
     <message>
         <source>Linked Document</source>
-        <translation type="unfinished"></translation>
+        <translation>Dokument Zlinkowany</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished">Wszystkie</translation>
+        <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Wstaw Czas i Date</translation>
     </message>
     <message>
         <source>Advanced Features</source>
-        <translation type="unfinished"></translation>
+        <translation>Funkcje Zaawansowane</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
-        <translation type="unfinished"></translation>
+        <translation>Pytaj przy Wychodzeniu</translation>
     </message>
     <message>
         <source>Always open linked file</source>
-        <translation type="unfinished"></translation>
+        <translation>Zawsze otwieraj zlinkowany plik</translation>
     </message>
     <message>
         <source>File Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Uprawnienia Pliku</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Listwa Wyszukiwania Otwarta</translation>
     </message>
     <message>
         <source>Goto Line...</source>
-        <translation type="unfinished"></translation>
+        <translation>Idz do Linii...</translation>
     </message>
     <message>
         <source>Auto Save 5 min.</source>
-        <translation type="unfinished"></translation>
+        <translation>Autozapis co 5 min.</translation>
     </message>
     <message>
         <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytor wykryl, ze&lt;br&gt;wybrales plik &lt;b&gt;.desktop&lt;/b&gt;.&lt;br&gt;Czy otworzyc plik &lt;b&gt;.desktop&lt;/b&gt; lub &lt;b&gt;zlinkowany&lt;/b&gt; plik?</translation>
     </message>
     <message>
         <source>Text Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Text Edit</translation>
     </message>
     <message>
         <source>Write Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapis sie nie powiodl</translation>
     </message>
     <message>
         <source>Unnamed</source>
-        <translation type="unfinished">Nienazwany</translation>
+        <translation>Nienazwany</translation>
     </message>
     <message>
         <source>Permissions</source>
-        <translation type="unfinished">Uprawnienia</translation>
+        <translation>Uprawnienia</translation>
     </message>
     <message>
         <source>Choose font</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz czcionke</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished">Tak</translation>
+        <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished">Nie</translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
@@ -167,35 +167,39 @@
     </message>
     <message>
         <source>Textedit</source>
-        <translation type="unfinished"></translation>
+        <translation>Textedit</translation>
     </message>
     <message>
         <source>Textedit detected
 you have unsaved changes
 Go ahead and save?
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Textedit wykryl, ze
+nie zapisales zmian.
+Kontynuowac i zapisac?
+</translation>
     </message>
     <message>
         <source>Don&apos;t Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie zapisuj</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Anuluj</translation>
     </message>
     <message>
         <source>Not enough lines</source>
-        <translation type="unfinished"></translation>
+        <translation>Za malo linii</translation>
     </message>
     <message>
         <source>%1 - Text Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 - Edytor Tekstu</translation>
     </message>
     <message>
         <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
 from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Czy na pewno chcesz&lt;BR&gt;&lt;b&gt;usunac&lt;/b&gt; aktualny plik
+z dysku?&lt;BR&gt;Operacja jest &lt;b&gt;nieodwracalna!&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
@@ -246,7 +250,7 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
     </message>
     <message>
         <source>Error- no user</source>
-        <translation>Blad- nie ma uzytkownika</translation>
+        <translation>Blad- brak uzytkownika</translation>
     </message>
     <message>
         <source>Error- no  group</source>
@@ -254,7 +258,7 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
     </message>
     <message>
         <source>Error setting ownership or group</source>
-        <translation>Blad ustawiania uprawnien</translation>
+        <translation>Blad ustawiania grupy</translation>
     </message>
     <message>
         <source>Error setting mode</source>
@@ -262,7 +266,7 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
     </message>
     <message>
         <source>File Permissions</source>
-        <translation type="unfinished"></translation>
+        <translation>Uprawnienia Pliku</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/tictac.ts b/i18n/pl/tictac.ts
index 038215c..5fdf435 100644
--- a/i18n/pl/tictac.ts
+++ b/i18n/pl/tictac.ts
@@ -3,7 +3,7 @@
     <name>QObject</name>
     <message>
         <source>TicTac</source>
-        <translation type="unfinished"></translation>
+        <translation>TicTac</translation>
     </message>
 </context>
 <context>
@@ -26,11 +26,11 @@
     </message>
     <message>
         <source>Click Play to start</source>
-        <translation>Wcisnij Play do startu</translation>
+        <translation>Wcisnij Graj do startu</translation>
     </message>
     <message>
         <source>Make your move</source>
-        <translation>Wykonaj moj ruch</translation>
+        <translation>Wykonaj ruch</translation>
     </message>
     <message>
         <source>You won!</source>
@@ -38,11 +38,11 @@
     </message>
     <message>
         <source>Computer won!</source>
-        <translation>Wygralem!</translation>
+        <translation>Komputer wygral!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
-        <translation>To jest linia</translation>
+        <translation>Remis</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/tinykate.ts b/i18n/pl/tinykate.ts
index f1498d1..a7efa7a 100644
--- a/i18n/pl/tinykate.ts
+++ b/i18n/pl/tinykate.ts
@@ -3,59 +3,59 @@
     <name>TinyKate</name>
     <message>
         <source>TinyKATE</source>
-        <translation type="unfinished"></translation>
+        <translation>TinyKATE</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Otworz</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz</translation>
     </message>
     <message>
         <source>Save As</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapisz Jako</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished"></translation>
+        <translation>Zamknij</translation>
     </message>
     <message>
         <source>File</source>
-        <translation type="unfinished"></translation>
+        <translation>Plik</translation>
     </message>
     <message>
         <source>Font +</source>
-        <translation type="unfinished"></translation>
+        <translation>Czcionka +</translation>
     </message>
     <message>
         <source>Font -</source>
-        <translation type="unfinished"></translation>
+        <translation>Czcionka -</translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation>Widok</translation>
     </message>
     <message>
         <source>Utils</source>
-        <translation type="unfinished"></translation>
+        <translation>Narzedzia</translation>
     </message>
     <message>
         <source>Highlighting</source>
-        <translation type="unfinished"></translation>
+        <translation>Podswietlanie</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustawienia</translation>
     </message>
     <message>
         <source>Unnamed %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nienazwany %1</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/today.ts b/i18n/pl/today.ts
index 74c5ec8..0a99604 100644
--- a/i18n/pl/today.ts
+++ b/i18n/pl/today.ts
@@ -3,34 +3,34 @@
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation type="unfinished"></translation>
+        <translation>Dzisiaj</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
-        <translation type="unfinished"></translation>
+        <translation>Wypelnij wizytowke</translation>
     </message>
     <message>
         <source>No plugins found</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie znaleziono zadnych wtyczek</translation>
     </message>
     <message>
         <source>No plugins activated</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak aktywnych wtyczek</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby uruchomic powiazana aplikacje</translation>
     </message>
     <message>
         <source>Owned by </source>
-        <translation type="unfinished"></translation>
+        <translation>Wlasciciel</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
-        <translation type="unfinished"></translation>
+        <translation>Dzisiaj</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
@@ -38,38 +38,38 @@
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby wyswietlic okno konfiguracyjne</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ktore wtyczki i w jakiej kolejnosci ladowac:</translation>
     </message>
     <message>
         <source>Move Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Do Gory</translation>
     </message>
     <message>
         <source>Move Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Do Dolu</translation>
     </message>
     <message>
         <source>active/order</source>
-        <translation type="unfinished"></translation>
+        <translation>aktywne/kolejnosc</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozne</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaznacz/odznacz pole by wlaczyc/wylaczyc wtyczke lub uzywajac przyciskow ze strzalkami po prawej stronie zmien kolejnosc wyswietlania</translation>
     </message>
     <message>
         <source>Today Config</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguracja Dzisiaj</translation>
     </message>
 </context>
 <context>
@@ -80,23 +80,23 @@
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zaznacz to jesli program ma byc automatycznie uruchamiany po wznowieniu.</translation>
     </message>
     <message>
         <source>autostart on resume?</source>
-        <translation type="unfinished"></translation>
+        <translation>autostart po wznowieniu?</translation>
     </message>
     <message>
         <source>tiny banner</source>
-        <translation type="unfinished"></translation>
+        <translation>malutki baner</translation>
     </message>
     <message>
         <source>Have small banner </source>
-        <translation type="unfinished"></translation>
+        <translation>Pokazuj maly baner</translation>
     </message>
     <message>
         <source> min</source>
-        <translation type="unfinished"></translation>
+        <translation>min</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
@@ -104,35 +104,35 @@
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation type="unfinished"></translation>
+        <translation>minut nieaktywny</translation>
     </message>
     <message>
         <source> pixel</source>
-        <translation type="unfinished"></translation>
+        <translation>pixeli</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation type="unfinished"></translation>
+        <translation>Ustaw rozmiar ikon w pikselach</translation>
     </message>
     <message>
         <source>icon size</source>
-        <translation type="unfinished"></translation>
+        <translation>rozmiar ikon</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"></translation>
+        <translation>sek</translation>
     </message>
     <message>
         <source>never</source>
-        <translation type="unfinished"></translation>
+        <translation>nigdy</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation type="unfinished"></translation>
+        <translation>Jak czesto program powinien sie odswiezac</translation>
     </message>
     <message>
         <source>refresh</source>
-        <translation type="unfinished"></translation>
+        <translation>odswiez</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index bbe07c3..edf0fcc 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -3,144 +3,144 @@
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h1&gt;Alarm o %1&lt;/h1&gt;&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarmy</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informacja</translation>
     </message>
     <message>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Status</translation>
     </message>
     <message>
         <source>Recurrence</source>
-        <translation type="unfinished"></translation>
+        <translation>Powtarzalnosc</translation>
     </message>
     <message>
         <source>Task Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytor Zadan</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
-        <translation type="unfinished"></translation>
+        <translation>Wprowadz Zadanie</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation type="unfinished">Edycja procesu</translation>
+        <translation>Edytuj Zadanie</translation>
     </message>
     <message>
         <source>silent</source>
-        <translation type="unfinished"></translation>
+        <translation>cichy</translation>
     </message>
     <message>
         <source>loud</source>
-        <translation type="unfinished"></translation>
+        <translation>glosny</translation>
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie ZrobTo</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowe z szablonu</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation type="unfinished">Nowy proces</translation>
+        <translation>Nowe Zadanie</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby stworzyc nowe zadanie.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation type="unfinished">Edycja procesu</translation>
+        <translation>Edytuj Zadanie</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby zmodyfikowac aktualne zadanie.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation type="unfinished"></translation>
+        <translation>Zobacz Zadanie</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby usunac aktualne zadanie.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun wszystkie...</translation>
     </message>
     <message>
         <source>Delete completed</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun ukonczone</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation type="unfinished"></translation>
+        <translation>Emituj</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby wyslac aktualne zadanie do innego urzadzenia.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished">Znajdz</translation>
+        <translation>Szukaj</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz ukonczone zadania</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz tylko przeterminowane zadania</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz terminy koncowe zadan</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Pokaz szybki pasek zadan</translation>
     </message>
     <message>
         <source>Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Dane</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategoria</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opcje</translation>
     </message>
     <message>
         <source>QuickEdit</source>
-        <translation type="unfinished"></translation>
+        <translation>SzybkaEdycja</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
@@ -150,15 +150,21 @@ The list displays the following information:
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>To jest lista wszystkich aktualnych zadan.
+
+Na liscie umieszczone sa nastepujace informacje:
+1. Ukonczone - zielony &quot;ptaszek&quot; oznacza zadanie ukonczone. Kliknij tu aby ukonczyc zadanie.
+2. Priorytet - graficzna reprezentacja priorytetu zadania. Kilknij tu podwojnie by go zmodyfikowac.
+3. Opis - opis zadania. Kliknij tu aby wybrac zadanie.
+4. Termin koncowy - pokazuje kiedy zadanie ma byc ukonczone. Ta kolumna moze byn pokazana lub ukryta przez wybranie Opcje-&gt;&apos;Pokaz terminy koncowe&apos; z powyzszego menu.</translation>
     </message>
     <message>
         <source>All Categories</source>
-        <translation type="unfinished">Wszystkie kategorie</translation>
+        <translation>Wszystkie kategorie</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation type="unfinished">Brak pamieci</translation>
+        <translation>Brak pamieci</translation>
     </message>
     <message>
         <source>Todo was unable
@@ -167,83 +173,88 @@ Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Program nie byl w stanie
+zapisac zmian.
+Zwolnij troche pamieci
+i sprobuj ponownie.
+
+Wyjsc mimo to?</translation>
     </message>
     <message>
         <source>Todo</source>
-        <translation type="unfinished">ZrobTo</translation>
+        <translation>ZrobTo</translation>
     </message>
     <message>
         <source>all tasks?</source>
-        <translation type="unfinished"></translation>
+        <translation>wszystkie zadania?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
-        <translation type="unfinished"></translation>
+        <translation>wszystkie ukonczone zadania?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation type="unfinished">Nieprzypisany</translation>
+        <translation>Nieprzypisany</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;P&gt;Przybylo %1 nowych zadan.&lt;p&gt; Czy chcesz dodac je do swojej listy ZrobTo?</translation>
     </message>
     <message>
         <source>New Tasks</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowe Zadania</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation type="unfinished"></translation>
+        <translation>Duplikuj</translation>
     </message>
     <message>
         <source>C.</source>
-        <translation type="unfinished"></translation>
+        <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
-        <translation type="unfinished"></translation>
+        <translation>Priorytet</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Opis</translation>
+        <translation>Opis</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation type="unfinished"></translation>
+        <translation>Termin koncowy</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguruj szablony</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation type="unfinished"></translation>
+        <translation>Priorytet:</translation>
     </message>
     <message>
         <source>Template Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytor szablonow</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nazwa</translation>
     </message>
     <message>
         <source>New Template %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowy Szablon %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
@@ -251,7 +262,11 @@ Quit Anyway?</source>
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby ustawic priorytet nowego zadania.
+
+Ten obszar nazywa sie szybkim paskiem zadan.
+
+Dzieki niemu mozesz szybko dodac zadanie do listy. Moze on byc pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaz szybki pasek zadan&apos; z powyzszego menu.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
@@ -259,11 +274,15 @@ It allows you to quickly add a new task to your list.  This area can be shown or
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu opis nowego zadania.
+
+Ten obszar nazywa sie szybkim paskiem zadan.
+
+Dzieki niemu mozesz szybko dodac zadanie do listy. Moze on byc pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaz szybki pasek zadan&apos; z powyzszego menu.</translation>
     </message>
     <message>
         <source>More</source>
-        <translation type="unfinished"></translation>
+        <translation>Wiecej</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
@@ -271,11 +290,15 @@ It allows you to quickly add a new task to your list.  This area can be shown or
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby wpisac dodatkowe informacje dla nowego zadania.
+
+Ten obszar nazywa sie szybkim paskiem zadan.
+
+Dzieki niemu mozesz szybko dodac zadanie do listy. Moze on byc pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaz szybki pasek zadan&apos; z powyzszego menu.</translation>
     </message>
     <message>
         <source>Enter</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz</translation>
     </message>
     <message>
         <source>Click here to add new task.
@@ -283,11 +306,15 @@ It allows you to quickly add a new task to your list.  This area can be shown or
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby dodac zadanie.
+
+Ten obszar nazywa sie szybkim paskiem zadan.
+
+Dzieki niemu mozesz szybko dodac zadanie do listy. Moze on byc pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaz szybki pasek zadan&apos; z powyzszego menu.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
@@ -295,287 +322,291 @@ It allows you to quickly add a new task to your list.  This area can be shown or
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby wyczyscic informacje o nowym zadaniu.
+
+Ten obszar nazywa sie szybkim paskiem zadan.
+
+Dzieki niemu mozesz szybko dodac zadanie do listy. Moze on byc pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaz szybki pasek zadan&apos; z powyzszego menu.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
-        <translation type="unfinished"></translation>
+        <translation>Dane nie mogo byc zmienione, trwa synchronizacja</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
-        <translation type="unfinished"></translation>
+        <translation>Dane nie mogo byc zmienione, trwa synchronizacja</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
-        <translation type="unfinished"></translation>
+        <translation>Widok Tabeli</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Brak</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 dni</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Nowe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Usun</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Czas</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Opis:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu krotki opis zadania.</translation>
     </message>
     <message>
         <source>Complete </source>
-        <translation type="unfinished"></translation>
+        <translation>Ukoncz</translation>
     </message>
     <message>
         <source>Work on </source>
-        <translation type="unfinished"></translation>
+        <translation>Pracuj nad</translation>
     </message>
     <message>
         <source>Buy </source>
-        <translation type="unfinished"></translation>
+        <translation>Kup</translation>
     </message>
     <message>
         <source>Organize </source>
-        <translation type="unfinished"></translation>
+        <translation>Organizuj</translation>
     </message>
     <message>
         <source>Get </source>
-        <translation type="unfinished"></translation>
+        <translation>Zdobadz</translation>
     </message>
     <message>
         <source>Update </source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualizuj</translation>
     </message>
     <message>
         <source>Create </source>
-        <translation type="unfinished"></translation>
+        <translation>Stworz</translation>
     </message>
     <message>
         <source>Plan </source>
-        <translation type="unfinished"></translation>
+        <translation>Planuj</translation>
     </message>
     <message>
         <source>Call </source>
-        <translation type="unfinished"></translation>
+        <translation>Zadzwon</translation>
     </message>
     <message>
         <source>Mail </source>
-        <translation type="unfinished"></translation>
+        <translation>Pisz list</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz tu priorytet zadania.</translation>
     </message>
     <message>
         <source>Very High</source>
-        <translation type="unfinished"></translation>
+        <translation>Bardzo wysoki</translation>
     </message>
     <message>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Wysoki</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation type="unfinished"></translation>
+        <translation>Normalny</translation>
     </message>
     <message>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Niski</translation>
     </message>
     <message>
         <source>Very Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Bardzo niski</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz kategorie dla tego zadania.</translation>
     </message>
     <message>
         <source>Recurring task</source>
-        <translation type="unfinished"></translation>
+        <translation>Zadanie powtarzalne</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu jesli zadanie powtarza sie w regularnych odstepach czasu. Czestotliwosc mozna ustawic w zakladce Powtarzalnosc.</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wpisz tu wszelkie dodatkowe informacje o tym zadaniu.</translation>
     </message>
     <message>
         <source>Todo List</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista ZrobTo</translation>
     </message>
     <message>
         <source>Summary:</source>
-        <translation type="unfinished"></translation>
+        <translation>Podsumowanie:</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Status:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby ustawic aktualny status tego zadania.</translation>
     </message>
     <message>
         <source>Started</source>
-        <translation type="unfinished"></translation>
+        <translation>Rozpoczete</translation>
     </message>
     <message>
         <source>Postponed</source>
-        <translation type="unfinished"></translation>
+        <translation>Przelozone</translation>
     </message>
     <message>
         <source>Finished</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukonczone</translation>
     </message>
     <message>
         <source>Not started</source>
-        <translation type="unfinished"></translation>
+        <translation>Nie zaczete</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation type="unfinished"></translation>
+        <translation>Postep:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wybierz tu postep prac nad tym zadaniem.</translation>
     </message>
     <message>
         <source>0 %</source>
-        <translation type="unfinished"></translation>
+        <translation>0%</translation>
     </message>
     <message>
         <source>20 %</source>
-        <translation type="unfinished"></translation>
+        <translation>20%</translation>
     </message>
     <message>
         <source>40 %</source>
-        <translation type="unfinished"></translation>
+        <translation>40%</translation>
     </message>
     <message>
         <source>60 %</source>
-        <translation type="unfinished"></translation>
+        <translation>60%</translation>
     </message>
     <message>
         <source>80 %</source>
-        <translation type="unfinished"></translation>
+        <translation>80%</translation>
     </message>
     <message>
         <source>100 %</source>
-        <translation type="unfinished"></translation>
+        <translation>100%</translation>
     </message>
     <message>
         <source>Start Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Data Poczatkowa:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby ustawic date poczatkowa tego zadania.</translation>
     </message>
     <message>
         <source>Due Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Data Koncowa:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby ustawic date koncowa tego zadania.</translation>
     </message>
     <message>
         <source>Completed:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ukonczone:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby zaznaczyc zadanie jako ukonczone.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby ustawic date ukonczenia tego zadania.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tryb Opiekuna:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu zeby ustawic role opiekuna.</translation>
     </message>
     <message>
         <source>Nothing</source>
-        <translation type="unfinished"></translation>
+        <translation>Zadna</translation>
     </message>
     <message>
         <source>Responsible</source>
-        <translation type="unfinished"></translation>
+        <translation>Odpowiedzialny</translation>
     </message>
     <message>
         <source>Done By</source>
-        <translation type="unfinished"></translation>
+        <translation>Zrobione przez</translation>
     </message>
     <message>
         <source>Coordinating</source>
-        <translation type="unfinished"></translation>
+        <translation>Koordynator</translation>
     </message>
     <message>
         <source>Maintainer:</source>
-        <translation type="unfinished"></translation>
+        <translation>Opiekun:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
-        <translation type="unfinished"></translation>
+        <translation>To jest imie opiekuna aktualnego zadania.</translation>
     </message>
     <message>
         <source>test</source>
-        <translation type="unfinished"></translation>
+        <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Kliknij tu aby wybrac opiekuna zadania.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/ubrowser.ts b/i18n/pl/ubrowser.ts
index f3079ca..d57aa29 100644
--- a/i18n/pl/ubrowser.ts
+++ b/i18n/pl/ubrowser.ts
@@ -18,19 +18,19 @@
     <name>QObject</name>
     <message>
         <source>Error!</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad!</translation>
     </message>
     <message>
         <source>IP-Address not found</source>
-        <translation type="unfinished"></translation>
+        <translation>Adres IP nie znaleziony</translation>
     </message>
     <message>
         <source>Error creating socket</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad przy tworzeniu gniazda</translation>
     </message>
     <message>
         <source>Error connecting to socket</source>
-        <translation type="unfinished"></translation>
+        <translation>Blad przy laczeniu z gniazdem</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/usermanager.ts b/i18n/pl/usermanager.ts
index 28f3895..dfb7403 100644
--- a/i18n/pl/usermanager.ts
+++ b/i18n/pl/usermanager.ts
@@ -3,29 +3,29 @@
     <name>GroupDialog</name>
     <message>
         <source>Add Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj Grupe</translation>
     </message>
     <message>
         <source>Edit Group</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj Grupe</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
         <source>Opie User Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Menadzer Uzytkownikow Opie</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
-        <translation type="unfinished"></translation>
+        <translation>Dodaj Uzytkownika</translation>
     </message>
     <message>
         <source>Edit User</source>
-        <translation type="unfinished"></translation>
+        <translation>Edytuj Uzytkownika</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/wordgame.ts b/i18n/pl/wordgame.ts
index fa987da..949bd04 100644
--- a/i18n/pl/wordgame.ts
+++ b/i18n/pl/wordgame.ts
@@ -7,11 +7,11 @@
     </message>
     <message>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>Wroc</translation>
+        <translation>Anuluj</translation>
     </message>
     <message>
         <source>Unknown word</source>
@@ -46,7 +46,7 @@
     </message>
     <message>
         <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Start</translation>
     </message>
 </context>
 <context>
@@ -77,11 +77,11 @@
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Wroc</translation>
+        <translation>&amp;Anuluj</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index 1882bf3..38d212b 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -39,11 +39,11 @@
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Mudar para Local</translation>
+        <translation type="obsolete">Mudar para Local</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Mudar para Remoto</translation>
+        <translation type="obsolete">Mudar para Remoto</translation>
     </message>
     <message>
         <source>Size</source>
@@ -264,11 +264,11 @@ e os seus conteúdos?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
-        <translation type="obsolete">Gestor de Ficheiros ::</translation>
+        <translation>Gestor de Ficheiros ::</translation>
     </message>
     <message>
         <source> kB free</source>
-        <translation type="obsolete">KB livres</translation>
+        <translation>KB livres</translation>
     </message>
     <message>
         <source>Copy &apos;%1&apos; As</source>
@@ -282,6 +282,18 @@ e os seus conteúdos?</translation>
         <source> As</source>
         <translation>Como</translation>
     </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation>Mudar para a Vista 1</translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation>Mudar para a Vista 2</translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation>Ainda Não Implementado</translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -374,5 +386,9 @@ Terminado
         <source>Error setting mode</source>
         <translation>Erro ao alterar o modo</translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation>Permissões de Ficheiro</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/calculator.ts b/i18n/pt/calculator.ts
index 731ea69..9135667 100644
--- a/i18n/pt/calculator.ts
+++ b/i18n/pt/calculator.ts
@@ -133,4 +133,203 @@
         <translation>Simples</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation>Simples</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation>Distancia</translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation>Área</translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation>acres</translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation>ºC</translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation>caracs</translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation>cm cub</translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation>pés cub</translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation>pol cub</translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation>ºF</translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation>oz fl (US)</translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation>pés</translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation>g</translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation>gal (US)</translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation>hectares</translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation>polegadas</translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation>km</translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation>l</translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation>lb</translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation>ton Lg</translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation>mg</translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation>mp</translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation>ml</translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation>mm</translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation>mil naut</translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation>oz</translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation>pontos</translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation>pt</translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation>qt</translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation>cm quad</translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation>pés quad</translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation>polegadas quad</translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation>km quad</translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation>m quad</translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation>mil quad</translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation>mm quad</translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation>jardas quad</translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation>st</translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation>Ton st</translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation>tblspoon</translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation>teaspoons</translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation>toneladas</translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation>jardas</translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/datebook.ts b/i18n/pt/datebook.ts
index 0e35fd5..a9e9b87 100644
--- a/i18n/pt/datebook.ts
+++ b/i18n/pt/datebook.ts
@@ -369,7 +369,7 @@ Sair na mesma?</translation>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation>STQQSSDS</translation>
+        <translation type="obsolete">STQQSSDS</translation>
     </message>
 </context>
 <context>
@@ -523,7 +523,7 @@ Sair na mesma?</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Hora Início</translation>
+        <translation type="obsolete">Hora Início</translation>
     </message>
     <message>
         <source>All day</source>
@@ -561,6 +561,10 @@ Sair na mesma?</translation>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation>Hora Início</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/pt/libbatteryapplet.ts b/i18n/pt/libbatteryapplet.ts
index 053bbfa..94b6be5 100644
--- a/i18n/pt/libbatteryapplet.ts
+++ b/i18n/pt/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation>Adaptador externo sem bateria</translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation>sem dados</translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation>Ipaq</translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation>Acessório</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/libqpe.ts b/i18n/pt/libqpe.ts
index 7511c5a..b85eaaf 100644
--- a/i18n/pt/libqpe.ts
+++ b/i18n/pt/libqpe.ts
@@ -861,6 +861,22 @@ novamente.</translation>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation>Não foi possível encontrar a aplicação</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation>Não foi possível iniciar a aplicação</translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/pt/mailit.ts b/i18n/pt/mailit.ts
index 5920ce5..0958874 100644
--- a/i18n/pt/mailit.ts
+++ b/i18n/pt/mailit.ts
@@ -205,6 +205,20 @@ Verifique conta e palavra chave&lt;/qt&gt;</translation>
         <translation>Ok
 </translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation>Mailit | Sem conta definida</translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation>Apagar conta:
+</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation>Nova</translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/pt/opieftp.ts b/i18n/pt/opieftp.ts
index 61f8d01..a5db000 100644
--- a/i18n/pt/opieftp.ts
+++ b/i18n/pt/opieftp.ts
@@ -244,5 +244,9 @@ Tem de estar vazia</translation>
         <source>Sorry name already taken</source>
         <translation>O nome já existe</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation>Adicionar</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/qpe.ts b/i18n/pt/qpe.ts
index 4e02e16..088e123 100644
--- a/i18n/pt/qpe.ts
+++ b/i18n/pt/qpe.ts
@@ -1,6 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppMonitor</name>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation>Idioma</translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation>Hora e Data</translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation>Informação Pessoal</translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problema na Aplicação</translation>
@@ -13,66 +28,86 @@
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Quer forçar o término da aplicação?&lt;/p&gt;</translation>
     </message>
-</context>
-<context>
-    <name>Calibrate</name>
     <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
-        <translation>Toque na cruz com firmeza e 
-precisão para calibrar o ecrâ.</translation>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;&lt;p&gt;Foi desactivado o carregamento rápido da aplicação. Toque e espere no icon da aplicação para reactivar.&lt;/qt&gt;</translation>
     </message>
     <message>
-        <source>Welcome to Opie</source>
-        <translation>Bem-vindo ao Opie</translation>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;&lt;b&gt;A aplicação %1 terminou com o código %2.&lt;/qt&gt;</translation>
     </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
     <message>
-        <source>Documents</source>
-        <translation>Documentos</translation>
+        <source>Application terminated</source>
+        <translation>A aplicação terminou</translation>
     </message>
     <message>
-        <source>Icon View</source>
-        <translation>Vista em Icones</translation>
+        <source>Application not found</source>
+        <translation>Não foi encontrada a aplicação</translation>
     </message>
     <message>
-        <source>List View</source>
-        <translation>Vista em Lista</translation>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Não foi possível localizar a aplicação &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation>&lt;qt&gt;Não foi possível encontrar a aplicação %1&lt;/qt&gt;</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Ok</translation>
     </message>
 </context>
 <context>
-    <name>DesktopApplication</name>
+    <name>DesktopPowerAlerter</name>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation>O nível de energia está muito baixo.
-Desligue o dispositivo ou ligue-o à corrente!</translation>
+        <source>Battery Status</source>
+        <translation>Estado da Bateria</translation>
     </message>
     <message>
-        <source>Battery is running very low.</source>
-        <translation>O nível de energia está baixo.</translation>
+        <source>Low Battery</source>
+        <translation>Bateria Fraca</translation>
     </message>
+</context>
+<context>
+    <name>FirstUse</name>
     <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation>O nível de energia da bateria extra está baixo.
-Deve carregá-la.</translation>
+        <source>&lt;&lt; Back</source>
+        <translation>&lt;&lt; Voltar</translation>
     </message>
     <message>
-        <source>business card</source>
-        <translation>Cart��o de Visita</translation>
+        <source>Next &gt;&gt;</source>
+        <translation>Pr��xima &gt;&gt;</translation>
     </message>
     <message>
-        <source>Information</source>
-        <translation>Informa��ão</translation>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation>Toque no ecr�� para continuar.</translation>
     </message>
     <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;A data do sistema não parece ser válida.
-(%1)&lt;/p&gt;&lt;p&gt;Deseja acertar o relógio?&lt;/p&gt;</translation>
+        <source>Please wait, loading %1 settings.</source>
+        <translation>Aguarde um momento. A carregar a configuração de %1.</translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation>Aguarde um momento...</translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation>Ecrâ de Fundo no Primeiro Uso</translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation>Finalizar</translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation>Unicode</translation>
     </message>
 </context>
 <context>
@@ -82,6 +117,10 @@ Deve carregá-la.</translation>
         <translation>Execução</translation>
     </message>
     <message>
+        <source>Documents</source>
+        <translation>Documentos</translation>
+    </message>
+    <message>
         <source> - Launcher</source>
         <translation>- Execução</translation>
     </message>
@@ -94,23 +133,34 @@ Deve carregá-la.</translation>
         <translation>&lt;p&gt;Não há nenhuma aplicação definida para este tipo de documento.&lt;p&gt;O tipo do documento é %1.</translation>
     </message>
     <message>
-        <source>Finding documents</source>
-        <translation>A procurar documentos</translation>
+        <source>OK</source>
+        <translation>Ok</translation>
     </message>
     <message>
-        <source>Searching documents</source>
-        <translation>A procurar nos documentos</translation>
+        <source>View as text</source>
+        <translation>Ver como texto</translation>
     </message>
 </context>
 <context>
-    <name>LauncherView</name>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation>&lt;b&gt;A procurar documentos...&lt;/b&gt;</translation>
+    </message>
     <message>
-        <source>%1 files</source>
-        <translation>%1 ficheiros</translation>
+        <source>Icon View</source>
+        <translation>Vista em Icones</translation>
     </message>
     <message>
-        <source>All types of file</source>
-        <translation>Todos os tipos de ficheiros</translation>
+        <source>List View</source>
+        <translation>Vista em Lista</translation>
+    </message>
+</context>
+<context>
+    <name>LauncherView</name>
+    <message>
+        <source>All types</source>
+        <translation>Todos os tipos</translation>
     </message>
     <message>
         <source>Document View</source>
@@ -118,70 +168,97 @@ Deve carregá-la.</translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation>Modo Salvaguarda</translation>
+    </message>
     <message>
-        <source>Medium inserted</source>
-        <translation>Cartão inserido</translation>
+        <source>Plugin Manager...</source>
+        <translation>Gestor de &quot;Plugins&quot;...</translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation>Reiniciar Opie</translation>
     </message>
     <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>Foi inserido um cartão. Quer indexar os ficheiros dele?</translation>
+        <source>Help...</source>
+        <translation>Ajuda...</translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation>Informação</translation>
     </message>
     <message>
-        <source>Which media files</source>
-        <translation>Que tipos de ficheiros</translation>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation>&lt;p&gt;A data do sistema não parece ser válida.
+(%1)&lt;/p&gt;&lt;p&gt;Deseja acertar o relógio?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Audio</source>
-        <translation>Àudio</translation>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation>O nível de energia está muito baixo.
+Desligue o dispositivo ou ligue-o à corrente!</translation>
     </message>
     <message>
-        <source>Image</source>
-        <translation>Imagem</translation>
+        <source>Battery is running very low. </source>
+        <translation>O nível de energia da bateria está muito baixo.</translation>
     </message>
     <message>
-        <source>Text</source>
-        <translation>Texto</translation>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation>O nível de energia da bateria extra está baixo.
+Deve carregá-la.</translation>
     </message>
     <message>
-        <source>Video</source>
-        <translation>V��deo</translation>
+        <source>business card</source>
+        <translation>Cart��o de Visita</translation>
     </message>
     <message>
-        <source>All</source>
-        <translation>Todos</translation>
+        <source>Safe Mode</source>
+        <translation>Modo de Salvaguarda</translation>
     </message>
     <message>
-        <source>Link apps</source>
-        <translation>Aplica����es</translation>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation>&lt;p&gt;Ocorreu um erro ao iniciar. O sistema est�� agora em modo de salvaguarda e os &quot;plugins&quot; n��o foram carregados. Poderá usar o gestor de &quot;plugins&quot; para desactivar os que estiverem a causar o erro.</translation>
     </message>
     <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation>Limitar a procura à directoria: (por implementar)</translation>
+        <source>OK</source>
+        <translation>Ok</translation>
     </message>
     <message>
-        <source>Add</source>
-        <translation>Adicionar</translation>
+        <source>Plugin Manager...</source>
+        <translation>Gestor de &quot;Plugins&quot;...</translation>
     </message>
     <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation>A sua decisão será guardada no cart��o.</translation>
+        <source>Memory Status</source>
+        <translation>Estado da Mem��ria</translation>
     </message>
     <message>
-        <source>Do not ask again for this medium</source>
-        <translation>Não perguntar novamente para este cartão</translation>
+        <source>Memory Low
+Please save data.</source>
+        <translation>Memória Baixa
+Grave os seus dados.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Battery Status</source>
-        <translation>Estado da Bateria</translation>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation>Memória Criticamente em Baixo
+Termine esta aplicação imediatamente.</translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
+        <source>Shutdown...</source>
+        <translation>Desligar</translation>
+    </message>
+    <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
@@ -198,10 +275,6 @@ Deve carregá-la.</translation>
         <translation>Reiniciar Opie</translation>
     </message>
     <message>
-        <source>Shutdown</source>
-        <translation>Desligar</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
@@ -242,16 +315,12 @@ Estas operações estão disponíveis principalmente para desenvolvimento e test
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation>A sincronizar</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Contactos&lt;/b&gt;</translation>
+        <source>Abort</source>
+        <translation>Abortar</translation>
     </message>
     <message>
-        <source>&amp;Cancel</source>
-        <translation>&amp;Cancelar</translation>
+        <source>Syncing:</source>
+        <translation>A Sincronizar:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/showimg.ts b/i18n/pt/showimg.ts
index e12534f..9897456 100644
--- a/i18n/pt/showimg.ts
+++ b/i18n/pt/showimg.ts
@@ -121,6 +121,33 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation>Nome de Ficheiro</translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation>Formato</translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation>Tamanho do Ficheiro</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Tamanho</translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation>Cores</translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation>Transparência</translation>
+    </message>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index 2e37210..766867e 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -83,7 +83,7 @@ Sair assim mesmo?</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Out of Space</translation>
+        <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Write Mail To</source>
@@ -99,1410 +99,1416 @@ Sair assim mesmo?</translation>
     </message>
     <message>
         <source>Import vCard</source>
-        <translation type="unfinished"></translation>
+        <translation>Importar vCard</translation>
     </message>
     <message>
         <source>Close Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Fechar Busca</translation>
     </message>
     <message>
         <source>Save all Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Salvar Tudo</translation>
     </message>
     <message>
         <source>Config</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração</translation>
     </message>
     <message>
         <source>Not Found</source>
-        <translation type="unfinished"></translation>
+        <translation>Não Encontrado</translation>
     </message>
     <message>
         <source>List</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista</translation>
     </message>
     <message>
         <source>Cards</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartões</translation>
     </message>
     <message>
         <source>Card</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartão</translation>
     </message>
     <message>
         <source>Start Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciar Busca</translation>
     </message>
     <message>
         <source>Right file type ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de arquivo correto ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Sim</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Não</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum contato encontrado para esta busca!</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
-        <translation type="unfinished"></translation>
+        <translation>O arquivo selecionado
+não termina em &quot;.vcf&quot;.
+Deseja mesmo abrí-lo?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar Contato ?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
-        <translation type="unfinished"></translation>
+        <translation>Deseja mesmo adicionar contato para
+%1 ?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Todos Sim</translation>
     </message>
     <message>
         <source>Export vCard</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportar vCard</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
-        <translation type="unfinished"></translation>
+        <translation>Você deve selecionar um contato !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
-        <translation type="unfinished"></translation>
+        <translation>Você deve especificar um nome de arquivo !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo de Busca</translation>
     </message>
     <message>
         <source>Use Regular Expressions</source>
-        <translation type="unfinished"></translation>
+        <translation>usar Expressões Regulares</translation>
     </message>
     <message>
         <source>Use Wildcards (*,?)</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar Máscaras (*,?)</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
-        <translation type="unfinished"></translation>
+        <translation>Sensível à Caixa</translation>
     </message>
     <message>
         <source>Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Correio</translation>
     </message>
     <message>
         <source>Prefer QT-Mail </source>
-        <translation type="unfinished"></translation>
+        <translation>Usar QT-Mail</translation>
     </message>
     <message>
         <source>Prefer Opie-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar Opie-Mail</translation>
     </message>
     <message>
         <source>Notice: QT-Mail is just 
 provided in the SHARP 
 default ROM. Opie-Mail 
 is provided free !</source>
-        <translation type="unfinished"></translation>
+        <translation>Aviso: QT-Mail somente é
+fornecido na ROM padrão
+da SHARP. Opie-Mail é
+forcnecido livremente !</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Misc</translation>
     </message>
     <message>
         <source>Search Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações de Busca</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Fonte</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Pequena</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation type="unfinished"></translation>
+        <translation>Normal</translation>
     </message>
     <message>
         <source>Large</source>
-        <translation type="unfinished"></translation>
+        <translation>Grande</translation>
     </message>
     <message>
         <source>Order</source>
-        <translation type="unfinished"></translation>
+        <translation>Ordem</translation>
     </message>
     <message>
         <source>Select Contact Order:</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecionar Ordem de Contato:</translation>
     </message>
     <message>
         <source>Up</source>
-        <translation type="unfinished">P/ Cima</translation>
+        <translation>P/ Cima</translation>
     </message>
     <message>
         <source>Down</source>
-        <translation type="unfinished">P/ Baixo</translation>
+        <translation>P/ Baixo</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Remover</translation>
     </message>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique em uma guia para selecionar</translation>
     </message>
     <message>
         <source>Settings for the search query style</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurações do tipo de busca</translation>
     </message>
     <message>
         <source>Search widget expects regular expressions if selected</source>
-        <translation type="unfinished"></translation>
+        <translation>O campo de busca aceitará expressões regulares se marcado</translation>
     </message>
     <message>
         <source>Search widget just expects simple wildcards</source>
-        <translation type="unfinished"></translation>
+        <translation>O campo de busca aceitará apenas máscaras simples</translation>
     </message>
     <message>
         <source>If selected, search differs between upper and lower chars</source>
-        <translation type="unfinished"></translation>
+        <translation>Se marcado, a busca diferenciará maiúsculas e minúsculas</translation>
     </message>
     <message>
         <source>Font size for list- and card view</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho da fonte para visão em lista e cartão</translation>
     </message>
     <message>
         <source>Fontsettings for list and card view</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração de fonte para visão em lista e cartão</translation>
     </message>
     <message>
         <source>Use Sharp&apos;s mail application if available</source>
-        <translation type="unfinished"></translation>
+        <translation>Use a aplicação de correio da Sharp se disponível</translation>
     </message>
     <message>
         <source>Use OPIE mail if installed</source>
-        <translation type="unfinished"></translation>
+        <translation>Use correio OPIE se instalado</translation>
     </message>
     <message>
         <source>Move selected attribute one line up</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover atributo selecionado uma linha acima</translation>
     </message>
     <message>
         <source>Move selected attribute one line down</source>
-        <translation type="unfinished"></translation>
+        <translation>Mover atributo selecionado uma linha abaixo</translation>
     </message>
     <message>
         <source>List of all available attributes</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de todos os atributos disponíveis</translation>
     </message>
     <message>
         <source>Add selected attribute from list below to the upper list</source>
-        <translation type="unfinished"></translation>
+        <translation>Adiciona o atributo selecionado na lista abaixo à lista acima</translation>
     </message>
     <message>
         <source>Remove the selected attribute from the upper list</source>
-        <translation type="unfinished"></translation>
+        <translation>Rmove o atributo selecionado da lista acima</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
-        <translation type="unfinished"></translation>
+        <translation>A ordem (Cima -&gt; Baixo) define o primeiro contato mostrado na segunda coluna da visão em lista</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra de Ferramentas/Menu</translation>
     </message>
     <message>
         <source>Fixed</source>
-        <translation type="unfinished"></translation>
+        <translation>Fixo</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
+        <translation>Alterna entre para barra de ferramentas/menu fixa após reiniciar a aplicação !</translation>
     </message>
     <message>
         <source>Moveable</source>
-        <translation type="unfinished"></translation>
+        <translation>Móvel</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
+        <translation>Alterna para barra de ferramentas/menu móveis após reiniciar a aplicação !</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation type="unfinished">Nome do Meio</translation>
+        <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation type="unfinished">Sobrenome</translation>
+        <translation>Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation type="unfinished"></translation>
+        <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation type="unfinished">Arquivar Como</translation>
+        <translation>Arquivar Como</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation type="unfinished">Sexo</translation>
+        <translation>Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Título Profissional</translation>
     </message>
     <message>
         <source>City</source>
-        <translation type="unfinished"></translation>
+        <translation>Cidade</translation>
     </message>
     <message>
         <source>State</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado</translation>
     </message>
     <message>
         <source>Country</source>
-        <translation type="unfinished"></translation>
+        <translation>País</translation>
     </message>
     <message>
         <source>Full Name...</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Organization</source>
-        <translation type="unfinished"></translation>
+        <translation>Organização</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished"></translation>
+        <translation>Categoria</translation>
     </message>
     <message>
         <source>Notes...</source>
-        <translation type="unfinished">Notas...</translation>
+        <translation>Notas...</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"></translation>
+        <translation>Geral</translation>
     </message>
     <message>
         <source>Business</source>
-        <translation type="unfinished"></translation>
+        <translation>Comercial</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished"></translation>
+        <translation>Residencial</translation>
     </message>
     <message>
         <source>Address</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço</translation>
     </message>
     <message>
         <source>Zip Code</source>
-        <translation type="unfinished"></translation>
+        <translation>CEP</translation>
     </message>
     <message>
         <source>United States</source>
-        <translation type="unfinished"></translation>
+        <translation>Estados Unidos</translation>
     </message>
     <message>
         <source>United Kingdom</source>
-        <translation type="unfinished"></translation>
+        <translation>Reino Unido</translation>
     </message>
     <message>
         <source>Japan</source>
-        <translation type="unfinished"></translation>
+        <translation>Japão</translation>
     </message>
     <message>
         <source>France</source>
-        <translation type="unfinished"></translation>
+        <translation>França</translation>
     </message>
     <message>
         <source>Germany</source>
-        <translation type="unfinished"></translation>
+        <translation>Alemanha</translation>
     </message>
     <message>
         <source>Norway</source>
-        <translation type="unfinished"></translation>
+        <translation>Noruega</translation>
     </message>
     <message>
         <source>Canada</source>
-        <translation type="unfinished"></translation>
+        <translation>Canadá</translation>
     </message>
     <message>
         <source>Male</source>
-        <translation type="unfinished">Masculino</translation>
+        <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
-        <translation type="unfinished">Feminino</translation>
+        <translation>Feminino</translation>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Detalhes</translation>
     </message>
     <message>
         <source>Enter Note</source>
-        <translation type="unfinished">Escrever Nota</translation>
+        <translation>Escrever Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar Nome</translation>
     </message>
     <message>
         <source>Contacts</source>
-        <translation type="unfinished">Contatos</translation>
+        <translation>Contatos</translation>
     </message>
     <message>
         <source>Albania</source>
-        <translation type="unfinished"></translation>
+        <translation>Albânia</translation>
     </message>
     <message>
         <source>Algeria</source>
-        <translation type="unfinished"></translation>
+        <translation>Algéria</translation>
     </message>
     <message>
         <source>American Samoa</source>
-        <translation type="unfinished"></translation>
+        <translation>Samoa Americana</translation>
     </message>
     <message>
         <source>Andorra</source>
-        <translation type="unfinished"></translation>
+        <translation>Andorra</translation>
     </message>
     <message>
         <source>Angola</source>
-        <translation type="unfinished"></translation>
+        <translation>Angola</translation>
     </message>
     <message>
         <source>Anguilla</source>
-        <translation type="unfinished"></translation>
+        <translation>Anguilla</translation>
     </message>
     <message>
         <source>Argentina</source>
-        <translation type="unfinished"></translation>
+        <translation>Argentina</translation>
     </message>
     <message>
         <source>Aruba</source>
-        <translation type="unfinished"></translation>
+        <translation>Aruba</translation>
     </message>
     <message>
         <source>Australia</source>
-        <translation type="unfinished"></translation>
+        <translation>Austrália</translation>
     </message>
     <message>
         <source>Austria</source>
-        <translation type="unfinished"></translation>
+        <translation>Áustria</translation>
     </message>
     <message>
         <source>Azerbaijan</source>
-        <translation type="unfinished"></translation>
+        <translation>Azerbaijão</translation>
     </message>
     <message>
         <source>Bahamas</source>
-        <translation type="unfinished"></translation>
+        <translation>Bahamas</translation>
     </message>
     <message>
         <source>Bahrain</source>
-        <translation type="unfinished"></translation>
+        <translation>Bahrain</translation>
     </message>
     <message>
         <source>Bangladesh</source>
-        <translation type="unfinished"></translation>
+        <translation>Bangladesh</translation>
     </message>
     <message>
         <source>Barbados</source>
-        <translation type="unfinished"></translation>
+        <translation>Barbados</translation>
     </message>
     <message>
         <source>Belarus</source>
-        <translation type="unfinished"></translation>
+        <translation>Belarus</translation>
     </message>
     <message>
         <source>Belgium</source>
-        <translation type="unfinished"></translation>
+        <translation>Bélgica</translation>
     </message>
     <message>
         <source>Belize</source>
-        <translation type="unfinished"></translation>
+        <translation>Belize</translation>
     </message>
     <message>
         <source>Benin</source>
-        <translation type="unfinished"></translation>
+        <translation>Benin</translation>
     </message>
     <message>
         <source>Bermuda</source>
-        <translation type="unfinished"></translation>
+        <translation>Bermuda</translation>
     </message>
     <message>
         <source>Bhutan</source>
-        <translation type="unfinished"></translation>
+        <translation>Bhutão</translation>
     </message>
     <message>
         <source>Botswana</source>
-        <translation type="unfinished"></translation>
+        <translation>Botswana</translation>
     </message>
     <message>
         <source>Bouvet Island</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Bouvet</translation>
     </message>
     <message>
         <source>Brazil</source>
-        <translation type="unfinished"></translation>
+        <translation>Brasil</translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
-        <translation type="unfinished"></translation>
+        <translation>Brunei Darussalam</translation>
     </message>
     <message>
         <source>Bulgaria</source>
-        <translation type="unfinished"></translation>
+        <translation>Bulgária</translation>
     </message>
     <message>
         <source>Burkina Faso</source>
-        <translation type="unfinished"></translation>
+        <translation>Burkina Faso</translation>
     </message>
     <message>
         <source>Burundi</source>
-        <translation type="unfinished"></translation>
+        <translation>Burundi</translation>
     </message>
     <message>
         <source>Cambodia</source>
-        <translation type="unfinished"></translation>
+        <translation>Cambodja</translation>
     </message>
     <message>
         <source>Cape Verde</source>
-        <translation type="unfinished"></translation>
+        <translation>Cabo Verde</translation>
     </message>
     <message>
         <source>Cayman Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Cayman</translation>
     </message>
     <message>
         <source>Chad</source>
-        <translation type="unfinished"></translation>
+        <translation>Chade</translation>
     </message>
     <message>
         <source>Chile</source>
-        <translation type="unfinished"></translation>
+        <translation>Chile</translation>
     </message>
     <message>
         <source>China</source>
-        <translation type="unfinished"></translation>
+        <translation>China</translation>
     </message>
     <message>
         <source>Christmas Island</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilha da Natividade</translation>
     </message>
     <message>
         <source>Colombia</source>
-        <translation type="unfinished"></translation>
+        <translation>Colômbia</translation>
     </message>
     <message>
         <source>Comoros</source>
-        <translation type="unfinished"></translation>
+        <translation>Comoros</translation>
     </message>
     <message>
         <source>Congo</source>
-        <translation type="unfinished"></translation>
+        <translation>Congo</translation>
     </message>
     <message>
         <source>Cook Island</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilha Cook</translation>
     </message>
     <message>
         <source>Costa Rica</source>
-        <translation type="unfinished"></translation>
+        <translation>Costa Rica</translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
-        <translation type="unfinished"></translation>
+        <translation>Costa do Marfim</translation>
     </message>
     <message>
         <source>Croatia</source>
-        <translation type="unfinished"></translation>
+        <translation>Croácia</translation>
     </message>
     <message>
         <source>Cuba</source>
-        <translation type="unfinished"></translation>
+        <translation>Cuba</translation>
     </message>
     <message>
         <source>Cyprus</source>
-        <translation type="unfinished"></translation>
+        <translation>Chipre</translation>
     </message>
     <message>
         <source>Czech Republic</source>
-        <translation type="unfinished"></translation>
+        <translation>República Checa</translation>
     </message>
     <message>
         <source>Denmark</source>
-        <translation type="unfinished"></translation>
+        <translation>Dinamarca</translation>
     </message>
     <message>
         <source>Djibouti</source>
-        <translation type="unfinished"></translation>
+        <translation>Djibouti</translation>
     </message>
     <message>
         <source>Dominica</source>
-        <translation type="unfinished"></translation>
+        <translation>Dominica</translation>
     </message>
     <message>
         <source>Dominican Republic</source>
-        <translation type="unfinished"></translation>
+        <translation>República Dominicana</translation>
     </message>
     <message>
         <source>East Timor</source>
-        <translation type="unfinished"></translation>
+        <translation>Timor Leste</translation>
     </message>
     <message>
         <source>Ecuador</source>
-        <translation type="unfinished"></translation>
+        <translation>Equador</translation>
     </message>
     <message>
         <source>Egypt</source>
-        <translation type="unfinished"></translation>
+        <translation>Egito</translation>
     </message>
     <message>
         <source>El Salvador</source>
-        <translation type="unfinished"></translation>
+        <translation>El Salvador</translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
-        <translation type="unfinished"></translation>
+        <translation>Guiné Equatorial</translation>
     </message>
     <message>
         <source>Eritrea</source>
-        <translation type="unfinished"></translation>
+        <translation>Eritrea</translation>
     </message>
     <message>
         <source>Estonia</source>
-        <translation type="unfinished"></translation>
+        <translation>Estônia</translation>
     </message>
     <message>
         <source>Ethiopia</source>
-        <translation type="unfinished"></translation>
+        <translation>Etiópia</translation>
     </message>
     <message>
         <source>Falkland Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Falkland</translation>
     </message>
     <message>
         <source>Faroe Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Faroe</translation>
     </message>
     <message>
         <source>Fiji</source>
-        <translation type="unfinished"></translation>
+        <translation>Fiji</translation>
     </message>
     <message>
         <source>Finland</source>
-        <translation type="unfinished"></translation>
+        <translation>Finlândia</translation>
     </message>
     <message>
         <source>French Guiana</source>
-        <translation type="unfinished"></translation>
+        <translation>Guiana Francesa</translation>
     </message>
     <message>
         <source>French Polynesia</source>
-        <translation type="unfinished"></translation>
+        <translation>Polinésia Francesa</translation>
     </message>
     <message>
         <source>Gabon</source>
-        <translation type="unfinished"></translation>
+        <translation>Gabão</translation>
     </message>
     <message>
         <source>Gambia</source>
-        <translation type="unfinished"></translation>
+        <translation>Gâmbia</translation>
     </message>
     <message>
         <source>Georgia</source>
-        <translation type="unfinished"></translation>
+        <translation>Geórgia</translation>
     </message>
     <message>
         <source>Gibraltar</source>
-        <translation type="unfinished"></translation>
+        <translation>Gibraltar</translation>
     </message>
     <message>
         <source>Greece</source>
-        <translation type="unfinished"></translation>
+        <translation>Grécia</translation>
     </message>
     <message>
         <source>Greenland</source>
-        <translation type="unfinished"></translation>
+        <translation>Groenlândia</translation>
     </message>
     <message>
         <source>Grenada</source>
-        <translation type="unfinished"></translation>
+        <translation>Granada</translation>
     </message>
     <message>
         <source>Guam</source>
-        <translation type="unfinished"></translation>
+        <translation>Guam</translation>
     </message>
     <message>
         <source>Guatemala</source>
-        <translation type="unfinished"></translation>
+        <translation>Guatemala</translation>
     </message>
     <message>
         <source>Guinea</source>
-        <translation type="unfinished"></translation>
+        <translation>Guiné</translation>
     </message>
     <message>
         <source>Guyana</source>
-        <translation type="unfinished"></translation>
+        <translation>Guiana</translation>
     </message>
     <message>
         <source>Haiti</source>
-        <translation type="unfinished"></translation>
+        <translation>Haiti</translation>
     </message>
     <message>
         <source>Holy See</source>
-        <translation type="unfinished"></translation>
+        <translation>Vaticano</translation>
     </message>
     <message>
         <source>Honduras</source>
-        <translation type="unfinished"></translation>
+        <translation>Honduras</translation>
     </message>
     <message>
         <source>Hong Kong</source>
-        <translation type="unfinished"></translation>
+        <translation>Hong Kong</translation>
     </message>
     <message>
         <source>Hungary</source>
-        <translation type="unfinished"></translation>
+        <translation>Hungaria</translation>
     </message>
     <message>
         <source>Iceland</source>
-        <translation type="unfinished"></translation>
+        <translation>Islândia</translation>
     </message>
     <message>
         <source>India</source>
-        <translation type="unfinished"></translation>
+        <translation>India</translation>
     </message>
     <message>
         <source>Indonesia</source>
-        <translation type="unfinished"></translation>
+        <translation>Indonésia</translation>
     </message>
     <message>
         <source>Ireland</source>
-        <translation type="unfinished"></translation>
+        <translation>Irlanda</translation>
     </message>
     <message>
         <source>Israel</source>
-        <translation type="unfinished"></translation>
+        <translation>Israel</translation>
     </message>
     <message>
         <source>Italy</source>
-        <translation type="unfinished"></translation>
+        <translation>Itália</translation>
     </message>
     <message>
         <source>Jordan</source>
-        <translation type="unfinished"></translation>
+        <translation>Jordânia</translation>
     </message>
     <message>
         <source>Kazakhstan</source>
-        <translation type="unfinished"></translation>
+        <translation>Cazaquistão</translation>
     </message>
     <message>
         <source>Kenya</source>
-        <translation type="unfinished"></translation>
+        <translation>Quênia</translation>
     </message>
     <message>
         <source>Korea</source>
-        <translation type="unfinished"></translation>
+        <translation>Coréia</translation>
     </message>
     <message>
         <source>Laos</source>
-        <translation type="unfinished"></translation>
+        <translation>Laos</translation>
     </message>
     <message>
         <source>Latvia</source>
-        <translation type="unfinished"></translation>
+        <translation>Látvia</translation>
     </message>
     <message>
         <source>Lebanon</source>
-        <translation type="unfinished"></translation>
+        <translation>Líbano</translation>
     </message>
     <message>
         <source>Lesotho</source>
-        <translation type="unfinished"></translation>
+        <translation>Lesoto</translation>
     </message>
     <message>
         <source>Liberia</source>
-        <translation type="unfinished"></translation>
+        <translation>Libéria</translation>
     </message>
     <message>
         <source>Liechtenstein</source>
-        <translation type="unfinished"></translation>
+        <translation>Liechtenstein</translation>
     </message>
     <message>
         <source>Lithuania</source>
-        <translation type="unfinished"></translation>
+        <translation>Lituânia</translation>
     </message>
     <message>
         <source>Luxembourg</source>
-        <translation type="unfinished"></translation>
+        <translation>Luxemburgo</translation>
     </message>
     <message>
         <source>Macau</source>
-        <translation type="unfinished"></translation>
+        <translation>Macau</translation>
     </message>
     <message>
         <source>Macedonia</source>
-        <translation type="unfinished"></translation>
+        <translation>Macedônia</translation>
     </message>
     <message>
         <source>Madagascar</source>
-        <translation type="unfinished"></translation>
+        <translation>Madagascar</translation>
     </message>
     <message>
         <source>Malawi</source>
-        <translation type="unfinished"></translation>
+        <translation>Malawi</translation>
     </message>
     <message>
         <source>Malaysia</source>
-        <translation type="unfinished"></translation>
+        <translation>Malásia</translation>
     </message>
     <message>
         <source>Maldives</source>
-        <translation type="unfinished"></translation>
+        <translation>Maldivas</translation>
     </message>
     <message>
         <source>Mali</source>
-        <translation type="unfinished"></translation>
+        <translation>Mali</translation>
     </message>
     <message>
         <source>Malta</source>
-        <translation type="unfinished"></translation>
+        <translation>Malta</translation>
     </message>
     <message>
         <source>Martinique</source>
-        <translation type="unfinished"></translation>
+        <translation>Martinica</translation>
     </message>
     <message>
         <source>Mauritania</source>
-        <translation type="unfinished"></translation>
+        <translation>Mauritânia</translation>
     </message>
     <message>
         <source>Mauritius</source>
-        <translation type="unfinished"></translation>
+        <translation>Mauritius</translation>
     </message>
     <message>
         <source>Mayotte</source>
-        <translation type="unfinished"></translation>
+        <translation>Mayotte</translation>
     </message>
     <message>
         <source>Mexico</source>
-        <translation type="unfinished"></translation>
+        <translation>México</translation>
     </message>
     <message>
         <source>Micronesia</source>
-        <translation type="unfinished"></translation>
+        <translation>Micronésia</translation>
     </message>
     <message>
         <source>Moldova</source>
-        <translation type="unfinished"></translation>
+        <translation>Moldova</translation>
     </message>
     <message>
         <source>Monaco</source>
-        <translation type="unfinished"></translation>
+        <translation>Mônaco</translation>
     </message>
     <message>
         <source>Mongolia</source>
-        <translation type="unfinished"></translation>
+        <translation>Mongólia</translation>
     </message>
     <message>
         <source>Montserrat</source>
-        <translation type="unfinished"></translation>
+        <translation>Montserrat</translation>
     </message>
     <message>
         <source>Morocco</source>
-        <translation type="unfinished"></translation>
+        <translation>Marocos</translation>
     </message>
     <message>
         <source>Mozambique</source>
-        <translation type="unfinished"></translation>
+        <translation>Moçambique</translation>
     </message>
     <message>
         <source>Myanmar</source>
-        <translation type="unfinished"></translation>
+        <translation>Myanmar</translation>
     </message>
     <message>
         <source>Namibia</source>
-        <translation type="unfinished"></translation>
+        <translation>Namíbia</translation>
     </message>
     <message>
         <source>Nauru</source>
-        <translation type="unfinished"></translation>
+        <translation>Nauru</translation>
     </message>
     <message>
         <source>Nepal</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepal</translation>
     </message>
     <message>
         <source>Netherlands</source>
-        <translation type="unfinished"></translation>
+        <translation>Holanda</translation>
     </message>
     <message>
         <source>New Caledonia</source>
-        <translation type="unfinished"></translation>
+        <translation>Nova Caledônia</translation>
     </message>
     <message>
         <source>New Zealand</source>
-        <translation type="unfinished"></translation>
+        <translation>Nova Zelândia</translation>
     </message>
     <message>
         <source>Nicaragua</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicarágua</translation>
     </message>
     <message>
         <source>Niger</source>
-        <translation type="unfinished"></translation>
+        <translation>Niger</translation>
     </message>
     <message>
         <source>Nigeria</source>
-        <translation type="unfinished"></translation>
+        <translation>Nigéria</translation>
     </message>
     <message>
         <source>Niue</source>
-        <translation type="unfinished"></translation>
+        <translation>Niue</translation>
     </message>
     <message>
         <source>Oman</source>
-        <translation type="unfinished"></translation>
+        <translation>Oman</translation>
     </message>
     <message>
         <source>Pakistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Paquistão</translation>
     </message>
     <message>
         <source>Palau</source>
-        <translation type="unfinished"></translation>
+        <translation>Palau</translation>
     </message>
     <message>
         <source>Panama</source>
-        <translation type="unfinished"></translation>
+        <translation>Panamá</translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
-        <translation type="unfinished"></translation>
+        <translation>Papua Nova Guiné</translation>
     </message>
     <message>
         <source>Paraguay</source>
-        <translation type="unfinished"></translation>
+        <translation>Paraguai</translation>
     </message>
     <message>
         <source>Peru</source>
-        <translation type="unfinished"></translation>
+        <translation>Peru</translation>
     </message>
     <message>
         <source>Philippines</source>
-        <translation type="unfinished"></translation>
+        <translation>Filipinas</translation>
     </message>
     <message>
         <source>Poland</source>
-        <translation type="unfinished"></translation>
+        <translation>Polônia</translation>
     </message>
     <message>
         <source>Portugal</source>
-        <translation type="unfinished"></translation>
+        <translation>Portugal</translation>
     </message>
     <message>
         <source>Puerto Rico</source>
-        <translation type="unfinished"></translation>
+        <translation>Porto Rico</translation>
     </message>
     <message>
         <source>Qatar</source>
-        <translation type="unfinished"></translation>
+        <translation>Qatar</translation>
     </message>
     <message>
         <source>Reunion</source>
-        <translation type="unfinished"></translation>
+        <translation>Reunião</translation>
     </message>
     <message>
         <source>Romania</source>
-        <translation type="unfinished"></translation>
+        <translation>Romênia</translation>
     </message>
     <message>
         <source>Russia</source>
-        <translation type="unfinished"></translation>
+        <translation>Russia</translation>
     </message>
     <message>
         <source>Rwanda</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruanda</translation>
     </message>
     <message>
         <source>Saint Lucia</source>
-        <translation type="unfinished"></translation>
+        <translation>Santa Lúcia</translation>
     </message>
     <message>
         <source>Samoa</source>
-        <translation type="unfinished"></translation>
+        <translation>Samoa</translation>
     </message>
     <message>
         <source>San Marino</source>
-        <translation type="unfinished"></translation>
+        <translation>San Marino</translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
-        <translation type="unfinished"></translation>
+        <translation>Árabia Saudita</translation>
     </message>
     <message>
         <source>Senegal</source>
-        <translation type="unfinished"></translation>
+        <translation>Senegal</translation>
     </message>
     <message>
         <source>Seychelles</source>
-        <translation type="unfinished"></translation>
+        <translation>Seychelles</translation>
     </message>
     <message>
         <source>Sierra Leone</source>
-        <translation type="unfinished"></translation>
+        <translation>Serra Leoa</translation>
     </message>
     <message>
         <source>Singapore</source>
-        <translation type="unfinished"></translation>
+        <translation>Singapura</translation>
     </message>
     <message>
         <source>Slovakia</source>
-        <translation type="unfinished"></translation>
+        <translation>Slovaquia</translation>
     </message>
     <message>
         <source>Slovenia</source>
-        <translation type="unfinished"></translation>
+        <translation>Slovenia</translation>
     </message>
     <message>
         <source>Solomon Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Salomão</translation>
     </message>
     <message>
         <source>Somalia</source>
-        <translation type="unfinished"></translation>
+        <translation>Somália</translation>
     </message>
     <message>
         <source>South Africa</source>
-        <translation type="unfinished"></translation>
+        <translation>África do Sul</translation>
     </message>
     <message>
         <source>Spain</source>
-        <translation type="unfinished"></translation>
+        <translation>Espanha</translation>
     </message>
     <message>
         <source>Sri Lanka</source>
-        <translation type="unfinished"></translation>
+        <translation>Sri Lanka</translation>
     </message>
     <message>
         <source>St. Helena</source>
-        <translation type="unfinished"></translation>
+        <translation>St. Helena</translation>
     </message>
     <message>
         <source>Sudan</source>
-        <translation type="unfinished"></translation>
+        <translation>Sudão</translation>
     </message>
     <message>
         <source>Suriname</source>
-        <translation type="unfinished"></translation>
+        <translation>Suriname</translation>
     </message>
     <message>
         <source>Swaziland</source>
-        <translation type="unfinished"></translation>
+        <translation>Suazilândia</translation>
     </message>
     <message>
         <source>Sweden</source>
-        <translation type="unfinished"></translation>
+        <translation>Suécia</translation>
     </message>
     <message>
         <source>Switzerland</source>
-        <translation type="unfinished"></translation>
+        <translation>Suiça</translation>
     </message>
     <message>
         <source>Taiwan</source>
-        <translation type="unfinished"></translation>
+        <translation>Taiwan</translation>
     </message>
     <message>
         <source>Tajikistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Tadjiquistão</translation>
     </message>
     <message>
         <source>Tanzania</source>
-        <translation type="unfinished"></translation>
+        <translation>Tanzânia</translation>
     </message>
     <message>
         <source>Thailand</source>
-        <translation type="unfinished"></translation>
+        <translation>Tailândia</translation>
     </message>
     <message>
         <source>Togo</source>
-        <translation type="unfinished"></translation>
+        <translation>Togo</translation>
     </message>
     <message>
         <source>Tokelau</source>
-        <translation type="unfinished"></translation>
+        <translation>Tokelau</translation>
     </message>
     <message>
         <source>Tonga</source>
-        <translation type="unfinished"></translation>
+        <translation>Tonga</translation>
     </message>
     <message>
         <source>Tunisia</source>
-        <translation type="unfinished"></translation>
+        <translation>Tunísia</translation>
     </message>
     <message>
         <source>Turkey</source>
-        <translation type="unfinished"></translation>
+        <translation>Turquia</translation>
     </message>
     <message>
         <source>Turkmenistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Turcomenistão</translation>
     </message>
     <message>
         <source>Tuvalu</source>
-        <translation type="unfinished"></translation>
+        <translation>Tuvalu</translation>
     </message>
     <message>
         <source>Uganda</source>
-        <translation type="unfinished"></translation>
+        <translation>Uganda</translation>
     </message>
     <message>
         <source>Ukraine</source>
-        <translation type="unfinished"></translation>
+        <translation>Ucrânia</translation>
     </message>
     <message>
         <source>Uruguay</source>
-        <translation type="unfinished"></translation>
+        <translation>Uruguai</translation>
     </message>
     <message>
         <source>Uzbekistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Uzbequistão</translation>
     </message>
     <message>
         <source>Vanuatu</source>
-        <translation type="unfinished"></translation>
+        <translation>Vanuatu</translation>
     </message>
     <message>
         <source>Venezuela</source>
-        <translation type="unfinished"></translation>
+        <translation>Venezuela</translation>
     </message>
     <message>
         <source>Virgin Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Virgens</translation>
     </message>
     <message>
         <source>Western Sahara</source>
-        <translation type="unfinished"></translation>
+        <translation>Saara Ocidental</translation>
     </message>
     <message>
         <source>Yemen</source>
-        <translation type="unfinished"></translation>
+        <translation>Iêmen</translation>
     </message>
     <message>
         <source>Yugoslavia</source>
-        <translation type="unfinished"></translation>
+        <translation>Iugoslávia</translation>
     </message>
     <message>
         <source>Zambia</source>
-        <translation type="unfinished"></translation>
+        <translation>Zâmbia</translation>
     </message>
     <message>
         <source>Zimbabwe</source>
-        <translation type="unfinished"></translation>
+        <translation>Zimbábue</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation type="unfinished"></translation>
+        <translation>Aniverário</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation type="unfinished"></translation>
+        <translation>Casamento</translation>
     </message>
     <message>
         <source>Kuwait</source>
-        <translation type="unfinished"></translation>
+        <translation>Kuwait</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Desconhecido</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">Apagar</translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Afghanistan</source>
-        <translation type="unfinished"></translation>
+        <translation>Afeganistão</translation>
     </message>
     <message>
         <source>Antarctica</source>
-        <translation type="unfinished"></translation>
+        <translation>Antárctica</translation>
     </message>
     <message>
         <source>Armenia</source>
-        <translation type="unfinished"></translation>
+        <translation>Armênia</translation>
     </message>
     <message>
         <source>Bolivia</source>
-        <translation type="unfinished"></translation>
+        <translation>Bolívia</translation>
     </message>
     <message>
         <source>Cameroon</source>
-        <translation type="unfinished"></translation>
+        <translation>Camarões</translation>
     </message>
     <message>
         <source>Ghana</source>
-        <translation type="unfinished"></translation>
+        <translation>Gana</translation>
     </message>
     <message>
         <source>Guadeloupe</source>
-        <translation type="unfinished"></translation>
+        <translation>Guadalupe</translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
-        <translation type="unfinished"></translation>
+        <translation>Guiné-Bissau</translation>
     </message>
     <message>
         <source>Jamaica</source>
-        <translation type="unfinished"></translation>
+        <translation>Jamaica</translation>
     </message>
     <message>
         <source>Kiribati</source>
-        <translation type="unfinished"></translation>
+        <translation>Kiribati</translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
-        <translation type="unfinished"></translation>
+        <translation>Quirguizstão</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
-        <translation type="unfinished"></translation>
+        <translation>Áreas Palestinas Soberanas</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
-        <translation type="unfinished"></translation>
+        <translation>Ilhas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
-        <translation type="unfinished"></translation>
+        <translation>Vietnã</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
-        <translation type="unfinished"></translation>
+        <translation>Pressione para entrar com sobrenome, nome do meio e nome</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Entre o nome completo diretamente ! Se você tem um sobrenome com várias palavras (por exemplo &quot;Da Silva&quot;), escreva &lt;sobrenome&gt;,&lt;nomes&gt; desta forma: &quot;Da Silva, José Maria&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
-        <translation type="unfinished"></translation>
+        <translation>O Título Profissional</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
-        <translation type="unfinished"></translation>
+        <translation>Algo como &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
-        <translation type="unfinished"></translation>
+        <translation>O local de trabalho do contato</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
-        <translation type="unfinished"></translation>
+        <translation>Pressione para selecionar o atributo a alterar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
-        <translation type="unfinished"></translation>
+        <translation>Pressione para selecionar como o nome será armazenado (e como será mostrado na visão em lista)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation type="unfinished"></translation>
+        <translation>Telefone Comercial</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation type="unfinished"></translation>
+        <translation>Fax Comercial</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
+        <translation>Celular Comercial</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation type="unfinished">E-mail Padrão</translation>
+        <translation>E-mail Padrão</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation type="unfinished"></translation>
+        <translation>E-mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation type="unfinished"></translation>
+        <translation>Tefone Residencial</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation type="unfinished"></translation>
+        <translation>Fax Residencial</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
+        <translation>Celular Pessoal</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation type="unfinished"></translation>
+        <translation>Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation type="unfinished"></translation>
+        <translation>Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation type="unfinished"></translation>
+        <translation>Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerente</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation type="unfinished"></translation>
+        <translation>Esposa</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation type="unfinished">Sexo</translation>
+        <translation>Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation type="unfinished"></translation>
+        <translation>Aniverário</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation type="unfinished"></translation>
+        <translation>Casamento</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Apelido</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation type="unfinished"></translation>
+        <translation>Crianças</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation type="unfinished">Título</translation>
+        <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation type="unfinished">Sobrenome</translation>
+        <translation>Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation type="unfinished"></translation>
+        <translation>Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation type="unfinished">Arquivar Como</translation>
+        <translation>Arquivar Como</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation type="unfinished"></translation>
+        <translation>Título Profissional</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation type="unfinished"></translation>
+        <translation>Departamento</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation type="unfinished"></translation>
+        <translation>Compania</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço Comercial</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation type="unfinished"></translation>
+        <translation>Cidade</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation type="unfinished"></translation>
+        <translation>CEP</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation type="unfinished"></translation>
+        <translation>País</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation type="unfinished"></translation>
+        <translation>Pager Comercial</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
+        <translation>Página Web Comercial</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation type="unfinished"></translation>
+        <translation>Endereço Residencial</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation type="unfinished"></translation>
+        <translation>Cidade</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation type="unfinished"></translation>
+        <translation>CEP</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation type="unfinished"></translation>
+        <translation>País</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
+        <translation>Página Web Pessoal</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation type="unfinished">Notas</translation>
+        <translation>Notas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/advancedfm.ts b/i18n/pt_BR/advancedfm.ts
index ed7af0f..8a9ac63 100644
--- a/i18n/pt_BR/advancedfm.ts
+++ b/i18n/pt_BR/advancedfm.ts
@@ -38,14 +38,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Switch to Local</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
@@ -255,6 +247,26 @@ and all it&apos;s contents ?</source>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -344,5 +356,9 @@ Finished
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/buzzword.ts b/i18n/pt_BR/buzzword.ts
index 076f679..e9acf82 100644
--- a/i18n/pt_BR/buzzword.ts
+++ b/i18n/pt_BR/buzzword.ts
@@ -3,19 +3,19 @@
     <name>BuzzWord</name>
     <message>
         <source>buZzword</source>
-        <translation type="unfinished"></translation>
+        <translation>Bingo</translation>
     </message>
     <message>
         <source>&amp;New game</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Novo jogo</translation>
     </message>
     <message>
         <source>&amp;Game</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Jogo</translation>
     </message>
     <message>
         <source>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h1&gt;&lt;b&gt;BINGO !&lt;/b&gt;&lt;/h1&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/calculator.ts b/i18n/pt_BR/calculator.ts
index 59013b2..77b6880 100644
--- a/i18n/pt_BR/calculator.ts
+++ b/i18n/pt_BR/calculator.ts
@@ -4,123 +4,123 @@
     <name>Calculator</name>
     <message>
         <source>%</source>
-        <translation type="unfinished">%</translation>
+        <translation>%</translation>
     </message>
     <message>
         <source>(</source>
-        <translation type="unfinished">(</translation>
+        <translation>(</translation>
     </message>
     <message>
         <source>)</source>
-        <translation type="unfinished">)</translation>
+        <translation>)</translation>
     </message>
     <message>
         <source>+</source>
-        <translation type="unfinished">+</translation>
+        <translation>+</translation>
     </message>
     <message>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>-</translation>
     </message>
     <message>
         <source>.</source>
-        <translation type="unfinished">.</translation>
+        <translation>.</translation>
     </message>
     <message>
         <source>/</source>
-        <translation type="unfinished">/</translation>
+        <translation>/</translation>
     </message>
     <message>
         <source>0</source>
-        <translation type="unfinished">0</translation>
+        <translation>0</translation>
     </message>
     <message>
         <source>1</source>
-        <translation type="unfinished">1</translation>
+        <translation>1</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished">2</translation>
+        <translation>2</translation>
     </message>
     <message>
         <source>3</source>
-        <translation type="unfinished">3</translation>
+        <translation>3</translation>
     </message>
     <message>
         <source>4</source>
-        <translation type="unfinished">4</translation>
+        <translation>4</translation>
     </message>
     <message>
         <source>5</source>
-        <translation type="unfinished">5</translation>
+        <translation>5</translation>
     </message>
     <message>
         <source>6</source>
-        <translation type="unfinished">6</translation>
+        <translation>6</translation>
     </message>
     <message>
         <source>7</source>
-        <translation type="unfinished">7</translation>
+        <translation>7</translation>
     </message>
     <message>
         <source>8</source>
-        <translation type="unfinished">8</translation>
+        <translation>8</translation>
     </message>
     <message>
         <source>9</source>
-        <translation type="unfinished">9</translation>
+        <translation>9</translation>
     </message>
     <message>
         <source>=</source>
-        <translation type="unfinished">=</translation>
+        <translation>=</translation>
     </message>
     <message>
         <source>x</source>
-        <translation type="unfinished">x</translation>
+        <translation>x</translation>
     </message>
     <message>
         <source>CE</source>
-        <translation type="unfinished">CE</translation>
+        <translation>CE</translation>
     </message>
     <message>
         <source>M+</source>
-        <translation type="unfinished">M+</translation>
+        <translation>M+</translation>
     </message>
     <message>
         <source>MC</source>
-        <translation type="unfinished">MC</translation>
+        <translation>MC</translation>
     </message>
     <message>
         <source>MR</source>
-        <translation type="unfinished">MR</translation>
+        <translation>MR</translation>
     </message>
     <message>
         <source>ln</source>
-        <translation type="unfinished">ln</translation>
+        <translation>ln</translation>
     </message>
     <message>
         <source>+/-</source>
-        <translation type="unfinished">+/-</translation>
+        <translation>+/-</translation>
     </message>
     <message>
         <source>cos</source>
-        <translation type="unfinished">cos</translation>
+        <translation>cos</translation>
     </message>
     <message>
         <source>log</source>
-        <translation type="unfinished">log</translation>
+        <translation>log</translation>
     </message>
     <message>
         <source>sin</source>
-        <translation type="unfinished">sen</translation>
+        <translation>sen</translation>
     </message>
     <message>
         <source>tan</source>
-        <translation type="unfinished">tan</translation>
+        <translation>tan</translation>
     </message>
     <message>
         <source>Experimental Calculator</source>
-        <translation type="unfinished">Calculadora Experimental</translation>
+        <translation>Calculadora Experimental</translation>
     </message>
 </context>
 <context>
@@ -131,6 +131,205 @@
     </message>
     <message>
         <source>Standard</source>
+        <translation>Padrão</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation>Padrão</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation>Distância</translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation>Área</translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation>acres</translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation>°C</translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation>quilates</translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation>cm</translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation>cm³</translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation>°F</translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation>km</translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation>m</translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation>mg</translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation>ml</translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation>mm</translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation>cm²</translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation>km²</translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation>m²</translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation>mm²</translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/calibrate.ts b/i18n/pt_BR/calibrate.ts
index 6af2a57..435f27c 100644
--- a/i18n/pt_BR/calibrate.ts
+++ b/i18n/pt_BR/calibrate.ts
@@ -4,11 +4,12 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toque os alvos firme e acuradamente
+para calibrar sua tela.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation type="unfinished"></translation>
+        <translation>Bemvindo ao Opie</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/citytime.ts b/i18n/pt_BR/citytime.ts
index 0fd5ddc..b8560a2 100644
--- a/i18n/pt_BR/citytime.ts
+++ b/i18n/pt_BR/citytime.ts
@@ -23,11 +23,11 @@
     <name>CityTimeBase</name>
     <message>
         <source>City Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Horário Local</translation>
     </message>
     <message>
         <source>Click on one of the set cities to replace it</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique em uma das cidades para substituí-la</translation>
     </message>
 </context>
 <context>
@@ -54,15 +54,15 @@
     </message>
     <message>
         <source>Continent</source>
-        <translation type="unfinished"></translation>
+        <translation>Continente</translation>
     </message>
     <message>
         <source>Select a continent/country here, then select a city</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecione um continente/país aqui, então selecione a cidade</translation>
     </message>
     <message>
         <source>City</source>
-        <translation type="unfinished"></translation>
+        <translation>Cidade</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/clock.ts b/i18n/pt_BR/clock.ts
index 438cea3..28b6e12 100644
--- a/i18n/pt_BR/clock.ts
+++ b/i18n/pt_BR/clock.ts
@@ -24,75 +24,75 @@
     </message>
     <message>
         <source>Snooze</source>
-        <translation type="unfinished"></translation>
+        <translation>Dormir</translation>
     </message>
     <message>
         <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajustar Alarme</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>Alarm Is On</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarme Ligado</translation>
     </message>
     <message>
         <source>Alarm Is Off</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarme Desligado</translation>
     </message>
     <message>
         <source>Set date and time.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajustar data e hora.</translation>
     </message>
     <message>
         <source>Clock: Alarm was missed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Relógio: Alarme perdido.</translation>
     </message>
     <message>
         <source>Alarm set: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarme ajustado: %1</translation>
     </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>Ajustar Alarme</translation>
     </message>
     <message>
         <source>Hour</source>
-        <translation type="unfinished"></translation>
+        <translation>Hora</translation>
     </message>
     <message>
         <source>Minute</source>
-        <translation type="unfinished"></translation>
+        <translation>Minuto</translation>
     </message>
     <message>
         <source>AM</source>
-        <translation type="unfinished"></translation>
+        <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
-        <translation type="unfinished"></translation>
+        <translation>PM</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
-        <translation type="unfinished"></translation>
+        <translation>Atraso para Dormir (minutos)</translation>
     </message>
     <message>
         <source>mp3 alarm</source>
-        <translation type="unfinished"></translation>
+        <translation>alarme mp3</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Tudo</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Audio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/datebook.ts b/i18n/pt_BR/datebook.ts
index 535620c..8f6b6fc 100644
--- a/i18n/pt_BR/datebook.ts
+++ b/i18n/pt_BR/datebook.ts
@@ -90,38 +90,38 @@ longa que o intervalo entre repetições.</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
-        <translation type="unfinished"></translation>
+        <translation>Duplicar Evento</translation>
     </message>
     <message>
         <source>Edit...</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar...</translation>
     </message>
     <message>
         <source>error box</source>
-        <translation type="unfinished"></translation>
+        <translation>caixa de erro</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>F</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <source>M</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <source>S</source>
-        <translation type="unfinished">S</translation>
+        <translation>S</translation>
     </message>
     <message>
         <source>T</source>
-        <translation type="unfinished">Q</translation>
+        <translation>Q</translation>
     </message>
     <message>
         <source>W</source>
-        <translation type="unfinished">Q</translation>
+        <translation>Q</translation>
     </message>
     <message>
         <source>Friday</source>
@@ -183,23 +183,23 @@ longa que o intervalo entre repetições.</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este evento ocupa todo o dia.</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Horário</translation>
     </message>
     <message>
         <source> - </source>
-        <translation type="unfinished"></translation>
+        <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation type="unfinished"></translation>
+        <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
-        <translation type="unfinished"></translation>
+        <translation>Enviar esta ocorrência</translation>
     </message>
 </context>
 <context>
@@ -226,169 +226,161 @@ longa que o intervalo entre repetições.</translation>
     </message>
     <message>
         <source>Calendar</source>
-        <translation type="unfinished">Calendário</translation>
+        <translation>Calendário</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Alarm Preset</source>
-        <translation type="unfinished">Alarme Padrão</translation>
+        <translation>Alarme Padrão</translation>
     </message>
     <message>
         <source>Start viewing events</source>
-        <translation type="unfinished">Horário de início dos eventos</translation>
+        <translation>Horário de inicial dos eventos</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation type="unfinished"> minutos</translation>
+        <translation> minutos</translation>
     </message>
     <message>
         <source>Start Time:</source>
-        <translation type="unfinished">Horário de Inicio:</translation>
+        <translation>Horário Inicial:</translation>
     </message>
     <message>
         <source>Preferences</source>
-        <translation type="unfinished">Preferências</translation>
+        <translation>Preferências</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
-        <translation type="unfinished">Configuração do Alarme</translation>
+        <translation>Configuração do Alarme</translation>
     </message>
     <message>
         <source>:00</source>
-        <translation type="unfinished">:00</translation>
+        <translation>:00</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation type="unfinished"></translation>
+        <translation>Misc</translation>
     </message>
     <message>
         <source>Row style:</source>
-        <translation type="unfinished"></translation>
+        <translation>Estilo de coluna:</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Padrão</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Médio</translation>
     </message>
     <message>
         <source>Large</source>
-        <translation type="unfinished"></translation>
+        <translation>Grande</translation>
     </message>
     <message>
         <source>Views</source>
-        <translation type="unfinished"></translation>
+        <translation>Vistas</translation>
     </message>
     <message>
         <source>Default view:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vista padrão:</translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished">Dia</translation>
+        <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
-        <translation type="unfinished">Semana</translation>
+        <translation>Semana</translation>
     </message>
     <message>
         <source>Week List</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista Semanal</translation>
     </message>
     <message>
         <source>Month</source>
-        <translation type="unfinished">Mês</translation>
+        <translation>Mês</translation>
     </message>
     <message>
         <source>Jump to current time</source>
-        <translation type="unfinished"></translation>
+        <translation>Ir para a hora corrente</translation>
     </message>
     <message>
         <source>Time display</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar horário</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished">Início</translation>
+        <translation>Início</translation>
     </message>
     <message>
         <source>Start-End</source>
-        <translation type="unfinished"></translation>
+        <translation>Início-Fim</translation>
     </message>
     <message>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>Padrões</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Localização:</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation type="unfinished"></translation>
+        <translation>Escitório</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished"></translation>
+        <translation>Residência</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Categoria:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este evento ocupa todo o dia.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
-        <translation type="unfinished"></translation>
+        <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
+        <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
-        <translation type="unfinished"></translation>
+        <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
-        <translation type="unfinished"></translation>
+        <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
 </context>
 <context>
@@ -430,74 +422,74 @@ longa que o intervalo entre repetições.</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Horário Inicial</translation>
     </message>
     <message>
         <source>End Time</source>
-        <translation type="unfinished"></translation>
+        <translation>Horário Final</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>Home</source>
-        <translation type="unfinished">Casa</translation>
+        <translation>Residência</translation>
     </message>
     <message>
         <source>Loud</source>
-        <translation type="unfinished">Alto</translation>
+        <translation>Alto</translation>
     </message>
     <message>
         <source>Lunch</source>
-        <translation type="unfinished">Almoço</translation>
+        <translation>Almoço</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
-        <translation type="unfinished">&amp;Alarme</translation>
+        <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source>Meeting</source>
-        <translation type="unfinished">Reunião</translation>
+        <translation>Reunião</translation>
     </message>
     <message>
         <source>No Repeat...</source>
-        <translation type="unfinished">Sem Repetição...</translation>
+        <translation>Sem Repetição...</translation>
     </message>
     <message>
         <source> minutes</source>
-        <translation type="unfinished"> minutos</translation>
+        <translation> minutos</translation>
     </message>
     <message>
         <source>Dinner</source>
-        <translation type="unfinished">Jantar</translation>
+        <translation>Jantar</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation type="unfinished">Escritório</translation>
+        <translation>Escritório</translation>
     </message>
     <message>
         <source>Repeat</source>
-        <translation type="unfinished">Repetir</translation>
+        <translation>Repetir</translation>
     </message>
     <message>
         <source>Location</source>
-        <translation type="unfinished">Local</translation>
+        <translation>Local</translation>
     </message>
     <message>
         <source>Silent</source>
-        <translation type="unfinished">Silencioso</translation>
+        <translation>Silencioso</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation type="unfinished">Viagem</translation>
+        <translation>Viagem</translation>
     </message>
     <message>
         <source>All day</source>
-        <translation type="unfinished">O Dia Todo</translation>
+        <translation>O Dia Todo</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished">Categoria</translation>
+        <translation>Categoria</translation>
     </message>
     <message>
         <source>New Event</source>
@@ -505,45 +497,45 @@ longa que o intervalo entre repetições.</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Start time</source>
-        <translation type="unfinished"></translation>
+        <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Time zone</source>
-        <translation type="unfinished"></translation>
+        <translation>Zona Horária</translation>
     </message>
     <message>
         <source>Description </source>
-        <translation type="unfinished"></translation>
+        <translation>Descrição</translation>
     </message>
     <message>
         <source>Start - End </source>
-        <translation type="unfinished"></translation>
+        <translation>Início - Fim</translation>
     </message>
     <message>
         <source>Note...</source>
-        <translation type="unfinished"></translation>
+        <translation>Nota...</translation>
+    </message>
+    <message>
+        <source>Start Time</source>
+        <translation>Horário Inicial</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
-        <translation type="unfinished"></translation>
+        <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;1/10&lt;/b&gt; Almoço</translation>
     </message>
 </context>
 <context>
@@ -698,14 +690,14 @@ e </translation>
     </message>
     <message>
         <source>on </source>
-        <translation type="unfinished"></translation>
+        <translation>em</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Day</source>
-        <translation type="unfinished">Dia</translation>
+        <translation>Dia</translation>
     </message>
     <message>
         <source>Fri</source>
@@ -737,15 +729,15 @@ e </translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished">Nenhum</translation>
+        <translation>Nenhum</translation>
     </message>
     <message>
         <source>Week</source>
-        <translation type="unfinished">Semana</translation>
+        <translation>Semana</translation>
     </message>
     <message>
         <source>Year</source>
-        <translation type="unfinished">Ano</translation>
+        <translation>Ano</translation>
     </message>
     <message>
         <source>Every</source>
@@ -753,7 +745,7 @@ e </translation>
     </message>
     <message>
         <source>Month</source>
-        <translation type="unfinished">Mês</translation>
+        <translation>Mês</translation>
     </message>
     <message>
         <source>years</source>
@@ -765,7 +757,7 @@ e </translation>
     </message>
     <message>
         <source>Every:</source>
-        <translation type="unfinished">Todo(a):</translation>
+        <translation>Todo(a):</translation>
     </message>
     <message>
         <source>Repeat On</source>
@@ -777,27 +769,27 @@ e </translation>
     </message>
     <message>
         <source>End On:</source>
-        <translation type="unfinished">Fim Em:</translation>
+        <translation>Termina Em:</translation>
     </message>
     <message>
         <source>Frequency</source>
-        <translation type="unfinished">Freqüência</translation>
+        <translation>Freqüência</translation>
     </message>
     <message>
         <source>Repeating Event </source>
-        <translation type="unfinished">Evento Repetitivo </translation>
+        <translation>Evento Repetitivo </translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation>WeekVar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/embeddedkonsole.ts b/i18n/pt_BR/embeddedkonsole.ts
index 5cd7de1..e9ec3d0 100644
--- a/i18n/pt_BR/embeddedkonsole.ts
+++ b/i18n/pt_BR/embeddedkonsole.ts
@@ -11,15 +11,15 @@
     <name>CommandEditDialogBase</name>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
-        <translation type="unfinished">&lt;B&gt;Comandos&lt;/B&gt;</translation>
+        <translation>&lt;B&gt;Comandos&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>Commands</source>
-        <translation type="unfinished">Comandos</translation>
+        <translation>Comandos</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
-        <translation type="unfinished">&lt;B&gt;Comandos Sugeridos&lt;/B&gt;:</translation>
+        <translation>&lt;B&gt;Comandos Sugeridos&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
@@ -208,11 +208,11 @@
     <name>editCommandBase</name>
     <message>
         <source>Enter command to add:</source>
-        <translation type="unfinished">Entre comando a adicionar:</translation>
+        <translation>Entre comando a adicionar:</translation>
     </message>
     <message>
         <source>Add command</source>
-        <translation type="unfinished">Adicionar comando</translation>
+        <translation>Adicionar comando</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/euroconv.ts b/i18n/pt_BR/euroconv.ts
index 3b1456a..5f508d1 100644
--- a/i18n/pt_BR/euroconv.ts
+++ b/i18n/pt_BR/euroconv.ts
@@ -3,7 +3,7 @@
     <name>QObject</name>
     <message>
         <source>Euroconv</source>
-        <translation type="unfinished"></translation>
+        <translation>Euroconv</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/language.ts b/i18n/pt_BR/language.ts
index a82d130..4fcab64 100644
--- a/i18n/pt_BR/language.ts
+++ b/i18n/pt_BR/language.ts
@@ -4,22 +4,22 @@
     <name>LanguageSettings</name>
     <message>
         <source>English</source>
-        <translation type="unfinished"></translation>
+        <translation>Inglês</translation>
     </message>
     <message>
         <source>default</source>
-        <translation type="unfinished"></translation>
+        <translation>padrao</translation>
     </message>
 </context>
 <context>
     <name>LanguageSettingsBase</name>
     <message>
         <source>Select language</source>
-        <translation type="unfinished">Seleção de Linguagem</translation>
+        <translation>Seleçione a linguagem</translation>
     </message>
     <message>
         <source>Language Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Configuração de Linguagem</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libbatteryapplet.ts b/i18n/pt_BR/libbatteryapplet.ts
index 3b20405..34d096c 100644
--- a/i18n/pt_BR/libbatteryapplet.ts
+++ b/i18n/pt_BR/libbatteryapplet.ts
@@ -56,31 +56,43 @@
     </message>
     <message>
         <source>Battery status</source>
-        <translation type="unfinished"></translation>
+        <translation>Situação da bateria</translation>
     </message>
     <message>
         <source>Failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Falha</translation>
     </message>
     <message>
         <source>could not open file</source>
-        <translation type="unfinished"></translation>
+        <translation>não pude abrir arquivo</translation>
     </message>
     <message>
         <source>Charging both devices</source>
-        <translation type="unfinished"></translation>
+        <translation>Carregando ambos dispositivos</translation>
     </message>
     <message>
         <source>Percentage battery remaining: </source>
-        <translation type="unfinished"></translation>
+        <translation>Porcentagem de bateria restante:</translation>
     </message>
     <message>
         <source>Battery time remaining: </source>
-        <translation type="unfinished"></translation>
+        <translation>Tempo restante de bateria:</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhuma jaqueta com bateria inserida</translation>
+    </message>
+    <message>
+        <source>no data</source>
+        <translation>sem dados</translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation>Ipaq  </translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation>Jaqueta</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libflat.ts b/i18n/pt_BR/libflat.ts
index 8406d92..bc0426c 100644
--- a/i18n/pt_BR/libflat.ts
+++ b/i18n/pt_BR/libflat.ts
@@ -3,7 +3,7 @@
     <name>Decoration</name>
     <message>
         <source>Flat</source>
-        <translation type="unfinished"></translation>
+        <translation>Plano</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libflatstyle.ts b/i18n/pt_BR/libflatstyle.ts
index 25a952a..6e69a24 100644
--- a/i18n/pt_BR/libflatstyle.ts
+++ b/i18n/pt_BR/libflatstyle.ts
@@ -4,7 +4,7 @@
     <message>
         <source>Flat</source>
         <comment>Name of the style Flat</comment>
-        <translation type="unfinished"></translation>
+        <translation>Plano</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libhomeapplet.ts b/i18n/pt_BR/libhomeapplet.ts
index 818c609..032814f 100644
--- a/i18n/pt_BR/libhomeapplet.ts
+++ b/i18n/pt_BR/libhomeapplet.ts
@@ -3,11 +3,11 @@
     <name>HomeApplet</name>
     <message>
         <source>Home shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Atalho Inicial</translation>
     </message>
     <message>
         <source>Desktop</source>
-        <translation type="unfinished"></translation>
+        <translation>Ambiente de Trabalho</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libirdaapplet.ts b/i18n/pt_BR/libirdaapplet.ts
index 1000064..a43641a 100644
--- a/i18n/pt_BR/libirdaapplet.ts
+++ b/i18n/pt_BR/libirdaapplet.ts
@@ -3,39 +3,39 @@
     <name>IrdaApplet</name>
     <message>
         <source>Discovered Device:</source>
-        <translation type="unfinished"></translation>
+        <translation>Dispositivo Encontrado:</translation>
     </message>
     <message>
         <source>Disable IrDA</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar IrDA</translation>
     </message>
     <message>
         <source>Enable IrDA</source>
-        <translation type="unfinished"></translation>
+        <translation>Deshabilitar IrDA</translation>
     </message>
     <message>
         <source>Disable Discovery</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar Descoberta</translation>
     </message>
     <message>
         <source>Enable Discovery</source>
-        <translation type="unfinished"></translation>
+        <translation>Deshabilitar Descoberta</translation>
     </message>
     <message>
         <source>Disable Receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Habilitar Recepção</translation>
     </message>
     <message>
         <source>Enable Receive</source>
-        <translation type="unfinished"></translation>
+        <translation>Deshabilitar Recepção</translation>
     </message>
     <message>
         <source>Found:</source>
-        <translation type="unfinished"></translation>
+        <translation>Encontrado:</translation>
     </message>
     <message>
         <source>Lost:</source>
-        <translation type="unfinished"></translation>
+        <translation>Perdido:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/liblogoutapplet.ts b/i18n/pt_BR/liblogoutapplet.ts
index 06cbe25..070acd9 100644
--- a/i18n/pt_BR/liblogoutapplet.ts
+++ b/i18n/pt_BR/liblogoutapplet.ts
@@ -3,16 +3,17 @@
     <name>LogoutApplet</name>
     <message>
         <source>Logout shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Atalho para logout</translation>
     </message>
     <message>
         <source>Logout</source>
-        <translation type="unfinished"></translation>
+        <translation>Logout</translation>
     </message>
     <message>
         <source>Do you really want to
 end this session ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Você realmete deseja
+encerrar esta sessão ?</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libopie.ts b/i18n/pt_BR/libopie.ts
index 24385f3..f7c8985 100644
--- a/i18n/pt_BR/libopie.ts
+++ b/i18n/pt_BR/libopie.ts
@@ -3,656 +3,658 @@
     <name>Button</name>
     <message>
         <source>Calendar Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Botão Claendário</translation>
     </message>
     <message>
         <source>Contacts Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Botão Contatos</translation>
     </message>
     <message>
         <source>Menu Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Botão Menu</translation>
     </message>
     <message>
         <source>Mail Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Botão Correio</translation>
     </message>
     <message>
         <source>Home Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Botão Início</translation>
     </message>
     <message>
         <source>Record Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Botão Gravar</translation>
     </message>
     <message>
         <source>Display Rotate</source>
-        <translation type="unfinished"></translation>
+        <translation>Rotação da Tela</translation>
     </message>
     <message>
         <source>Lower+Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Inferior+Cima</translation>
     </message>
     <message>
         <source>Lower+Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Inferior+Baixo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Inferior+Direita</translation>
     </message>
     <message>
         <source>Lower+Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Inferior+Esquerda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Superior+Cima</translation>
     </message>
     <message>
         <source>Upper+Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Superior+Baixo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Superior+Direita</translation>
     </message>
     <message>
         <source>Upper+Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Superior+Esquerda</translation>
     </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mat:</translation>
     </message>
     <message>
         <source>Sat:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
-        <translation type="unfinished"></translation>
+        <translation>Val:</translation>
     </message>
     <message>
         <source>Red:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verm:</translation>
     </message>
     <message>
         <source>Green:</source>
-        <translation type="unfinished"></translation>
+        <translation>Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
-        <translation type="unfinished"></translation>
+        <translation>Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
-        <translation type="unfinished"></translation>
+        <translation>Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecione a cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
-        <translation type="unfinished"></translation>
+        <translation>Mais</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation type="unfinished"></translation>
+        <translation>Mais...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
-        <translation type="unfinished"></translation>
+        <translation>DiálogoArquivo</translation>
     </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
-        <translation type="unfinished"></translation>
+        <translation>Salvar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
-        <translation type="unfinished"></translation>
+        <translation>Grande</translation>
     </message>
     <message>
         <source>Medium</source>
-        <translation type="unfinished"></translation>
+        <translation>Média</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Pequena</translation>
     </message>
 </context>
 <context>
     <name>OFontSelector</name>
     <message>
         <source>Style</source>
-        <translation type="unfinished"></translation>
+        <translation>Estilo</translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="unfinished"></translation>
+        <translation>The Quick Brown Fox Jumps Over The Lazy Dog</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceBase</name>
     <message>
         <source>Repeating Event </source>
-        <translation type="unfinished"></translation>
+        <translation>Evento com Repetição</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished"></translation>
+        <translation>Dia</translation>
     </message>
     <message>
         <source>Week</source>
-        <translation type="unfinished"></translation>
+        <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
-        <translation type="unfinished"></translation>
+        <translation>Mês</translation>
     </message>
     <message>
         <source>Year</source>
-        <translation type="unfinished"></translation>
+        <translation>Ano</translation>
     </message>
     <message>
         <source>Every:</source>
-        <translation type="unfinished"></translation>
+        <translation>
+A cada:</translation>
     </message>
     <message>
         <source>Frequency</source>
-        <translation type="unfinished"></translation>
+        <translation>Frequência</translation>
     </message>
     <message>
         <source>End On:</source>
-        <translation type="unfinished"></translation>
+        <translation>Termina Em:</translation>
     </message>
     <message>
         <source>No End Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem Data Final</translation>
     </message>
     <message>
         <source>Repeat On</source>
-        <translation type="unfinished"></translation>
+        <translation>Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
-        <translation type="unfinished"></translation>
+        <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
-        <translation type="unfinished"></translation>
+        <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
-        <translation type="unfinished"></translation>
+        <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
-        <translation type="unfinished"></translation>
+        <translation>Qui</translation>
     </message>
     <message>
         <source>Fri</source>
-        <translation type="unfinished"></translation>
+        <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
-        <translation type="unfinished"></translation>
+        <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
-        <translation type="unfinished"></translation>
+        <translation>Dom</translation>
     </message>
     <message>
         <source>Every</source>
-        <translation type="unfinished"></translation>
+        <translation>A cada</translation>
     </message>
     <message>
         <source>Var1</source>
-        <translation type="unfinished"></translation>
+        <translation>Var1</translation>
     </message>
     <message>
         <source>Var 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Var 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
-        <translation type="unfinished"></translation>
+        <translation>WeekVar</translation>
     </message>
 </context>
 <context>
     <name>ORecurranceWidget</name>
     <message>
         <source>No End Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem Data Final</translation>
     </message>
     <message>
         <source>days</source>
-        <translation type="unfinished"></translation>
+        <translation>dias</translation>
     </message>
     <message>
         <source>day</source>
-        <translation type="unfinished"></translation>
+        <translation>dia</translation>
     </message>
     <message>
         <source>weeks</source>
-        <translation type="unfinished"></translation>
+        <translation>semanas</translation>
     </message>
     <message>
         <source>week</source>
-        <translation type="unfinished"></translation>
+        <translation>semana</translation>
     </message>
     <message>
         <source>months</source>
-        <translation type="unfinished"></translation>
+        <translation>meses</translation>
     </message>
     <message>
         <source>month</source>
-        <translation type="unfinished"></translation>
+        <translation>mês</translation>
     </message>
     <message>
         <source>years</source>
-        <translation type="unfinished"></translation>
+        <translation>anos</translation>
     </message>
     <message>
         <source>year</source>
-        <translation type="unfinished"></translation>
+        <translation>ano</translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation>e</translation>
     </message>
     <message>
         <source>,
 and </source>
-        <translation type="unfinished"></translation>
+        <translation>,
+e</translation>
     </message>
     <message>
         <source>, and </source>
-        <translation type="unfinished"></translation>
+        <translation>, e</translation>
     </message>
     <message>
         <source>No Repeat</source>
-        <translation type="unfinished"></translation>
+        <translation>Sem repetição</translation>
     </message>
     <message>
         <source>day(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>dia(s)</translation>
     </message>
     <message>
         <source>Repeat On</source>
-        <translation type="unfinished"></translation>
+        <translation>Repete Em</translation>
     </message>
     <message>
         <source>Mon</source>
-        <translation type="unfinished"></translation>
+        <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
-        <translation type="unfinished"></translation>
+        <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
-        <translation type="unfinished"></translation>
+        <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
-        <translation type="unfinished"></translation>
+        <translation>Qui</translation>
     </message>
     <message>
         <source>Fri</source>
-        <translation type="unfinished"></translation>
+        <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
-        <translation type="unfinished"></translation>
+        <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
-        <translation type="unfinished"></translation>
+        <translation>Dom</translation>
     </message>
     <message>
         <source>week(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
-        <translation type="unfinished"></translation>
+        <translation>Repete por</translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished"></translation>
+        <translation>Dia</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
-        <translation type="unfinished"></translation>
+        <translation>A cada</translation>
     </message>
     <message>
         <source>on </source>
-        <translation type="unfinished"></translation>
+        <translation>na(o)</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
-        <translation type="unfinished"></translation>
+        <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
-        <translation type="unfinished"></translation>
+        <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
-        <translation type="unfinished"></translation>
+        <translation>Escolha a Hora:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation type="unfinished"></translation>
+        <translation>Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
-        <translation type="unfinished"></translation>
+        <translation>E-mail Padrão:</translation>
     </message>
     <message>
         <source>Office: </source>
-        <translation type="unfinished"></translation>
+        <translation>Escritório:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
-        <translation type="unfinished"></translation>
+        <translation>Página Web Comercial:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
-        <translation type="unfinished"></translation>
+        <translation>Telefone Comercial:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
-        <translation type="unfinished"></translation>
+        <translation>Fax Comercial:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
-        <translation type="unfinished"></translation>
+        <translation>Celular Comercial:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
-        <translation type="unfinished"></translation>
+        <translation>Pager Comercial:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
-        <translation type="unfinished"></translation>
+        <translation>Pagina Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
-        <translation type="unfinished"></translation>
+        <translation>Telefone Residencial:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
-        <translation type="unfinished"></translation>
+        <translation>Fax Residencial:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
-        <translation type="unfinished"></translation>
+        <translation>Celular Pessoal:</translation>
     </message>
     <message>
         <source>All Emails: </source>
-        <translation type="unfinished"></translation>
+        <translation>Todos os E-mails:</translation>
     </message>
     <message>
         <source>Profession: </source>
-        <translation type="unfinished"></translation>
+        <translation>Profissão:</translation>
     </message>
     <message>
         <source>Assistant: </source>
-        <translation type="unfinished"></translation>
+        <translation>Assistente:</translation>
     </message>
     <message>
         <source>Manager: </source>
-        <translation type="unfinished"></translation>
+        <translation>Gerente:</translation>
     </message>
     <message>
         <source>Male</source>
-        <translation type="unfinished"></translation>
+        <translation>Masculino</translation>
     </message>
     <message>
         <source>Female</source>
-        <translation type="unfinished"></translation>
+        <translation>Feminino</translation>
     </message>
     <message>
         <source>Gender: </source>
-        <translation type="unfinished"></translation>
+        <translation>Sexo:</translation>
     </message>
     <message>
         <source>Spouse: </source>
-        <translation type="unfinished"></translation>
+        <translation>Conjuge:</translation>
     </message>
     <message>
         <source>Birthday: </source>
-        <translation type="unfinished"></translation>
+        <translation>Aniversário:</translation>
     </message>
     <message>
         <source>Anniversary: </source>
-        <translation type="unfinished"></translation>
+        <translation>Casamento:</translation>
     </message>
     <message>
         <source>Children: </source>
-        <translation type="unfinished"></translation>
+        <translation>Crianças:</translation>
     </message>
     <message>
         <source>Nickname: </source>
-        <translation type="unfinished"></translation>
+        <translation>Apelido:</translation>
     </message>
     <message>
         <source>Notes:</source>
-        <translation type="unfinished"></translation>
+        <translation>Notas:</translation>
     </message>
     <message>
         <source>Start:</source>
-        <translation type="unfinished"></translation>
+        <translation>Inicio:</translation>
     </message>
     <message>
         <source>End:</source>
-        <translation type="unfinished"></translation>
+        <translation>Fim:</translation>
     </message>
     <message>
         <source>Note:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
-        <translation type="unfinished"></translation>
+        <translation>A cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2 a cada</translation>
     </message>
     <message>
         <source>The %1 every </source>
-        <translation type="unfinished"></translation>
+        <translation>No(a) %1 de cada</translation>
     </message>
     <message>
         <source>Every </source>
-        <translation type="unfinished"></translation>
+        <translation>A Cada</translation>
     </message>
     <message>
         <source>Monday</source>
-        <translation type="unfinished"></translation>
+        <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
-        <translation type="unfinished"></translation>
+        <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
-        <translation type="unfinished"></translation>
+        <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
-        <translation type="unfinished"></translation>
+        <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
-        <translation type="unfinished"></translation>
+        <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
-        <translation type="unfinished"></translation>
+        <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
-        <translation type="unfinished"></translation>
+        <translation>Domingo</translation>
     </message>
     <message>
         <source>Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Arquivos</translation>
     </message>
     <message>
         <source>All Files</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos os arquivos</translation>
     </message>
     <message>
         <source>Very high</source>
-        <translation type="unfinished"></translation>
+        <translation>Muito Alto</translation>
     </message>
     <message>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Alto</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation type="unfinished"></translation>
+        <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Baixo</translation>
     </message>
     <message>
         <source>Very low</source>
-        <translation type="unfinished"></translation>
+        <translation>Muito Baixo</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Localização:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
-        <translation type="unfinished"></translation>
+        <translation>Este evento dura todo o dia</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
-        <translation type="unfinished"></translation>
+        <translation>Este evento dura vários dias</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço Profissional:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço Residencial:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
-        <translation type="unfinished"></translation>
+        <translation>No(a) %1 de cada </translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
-        <translation type="unfinished"></translation>
+        <translation>º</translation>
     </message>
     <message>
         <source>nd</source>
-        <translation type="unfinished"></translation>
+        <translation>º</translation>
     </message>
     <message>
         <source>rd</source>
-        <translation type="unfinished"></translation>
+        <translation>º</translation>
     </message>
     <message>
         <source>th</source>
-        <translation type="unfinished"></translation>
+        <translation>º</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libqpe.ts b/i18n/pt_BR/libqpe.ts
index 08118d7..86c3f03 100644
--- a/i18n/pt_BR/libqpe.ts
+++ b/i18n/pt_BR/libqpe.ts
@@ -49,47 +49,47 @@
     <name>CategoryEditBase</name>
     <message>
         <source>Add</source>
-        <translation type="unfinished">Adicionar</translation>
+        <translation>Adicionar</translation>
     </message>
     <message>
         <source>Categories Go Here</source>
-        <translation type="unfinished">Categorias Vão Aqui</translation>
+        <translation>Categorias Vão Aqui</translation>
     </message>
     <message>
         <source>Category Edit</source>
-        <translation type="unfinished">Editar Categoria</translation>
+        <translation>Editar Categoria</translation>
     </message>
     <message>
         <source>Global</source>
-        <translation type="unfinished">Global</translation>
+        <translation>Global</translation>
     </message>
     <message>
         <source>Categories</source>
-        <translation type="unfinished">Categorias</translation>
+        <translation>Categorias</translation>
     </message>
     <message>
         <source>Application</source>
-        <translation type="unfinished">Aplicação</translation>
+        <translation>Aplicação</translation>
     </message>
     <message>
         <source>Check the categories this document belongs to.</source>
-        <translation type="unfinished"></translation>
+        <translation>Marque as categorias a que este documento pertence.</translation>
     </message>
     <message>
         <source>Enter a new category here.  Press &lt;b&gt;Add&lt;/b&gt; to add it to the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entre a nova categoria aqui. Pressione &lt;b&gt;Adicionar&lt;&gt; para adicioná-la a lista.</translation>
     </message>
     <message>
         <source>Enter a new category to the left and press to add it to the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entre uma nova categoria à esquerda e pressione para adicioná-la a lista.</translation>
     </message>
     <message>
         <source>Press to delete the highlighted category.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pressione para remover a categoria destacada.</translation>
     </message>
     <message>
         <source>Check to make this property available to all applications.</source>
-        <translation type="unfinished"></translation>
+        <translation>Marque para tornar esta propriedade disponível para todas as aplicações.</translation>
     </message>
 </context>
 <context>
@@ -128,19 +128,19 @@ editando as categorias.</translation>
     <name>DateBookMonthHeader</name>
     <message>
         <source>Show January in the selected year</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra Janeiro do ano selecionado</translation>
     </message>
     <message>
         <source>Show the previous month</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra o mês anterior</translation>
     </message>
     <message>
         <source>Show the next month</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra o próximo mês</translation>
     </message>
     <message>
         <source>Show December in the selected year</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostra Dezembro do ano selecionado</translation>
     </message>
 </context>
 <context>
@@ -151,27 +151,27 @@ editando as categorias.</translation>
     </message>
     <message>
         <source>Show documents of this type</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar documentos deste tipo</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation type="unfinished">Visualizador de Documentos</translation>
+        <translation>Visualizador de Documentos</translation>
     </message>
     <message>
         <source>Show documents in this category</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar documentos nesta categoria</translation>
     </message>
     <message>
         <source>Click to select a document from the list</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique para selecionar um documento da lista</translation>
     </message>
     <message>
         <source>, or select &lt;b&gt;New Document&lt;/b&gt; to create a new document.</source>
-        <translation type="unfinished"></translation>
+        <translation>, ou selecione &lt;b&gt;Novo Documento&lt;/b&gt; para cliar um novo documento.</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;Click and hold for document properties.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;br&gt;&lt;br&gt;Clique e segure para mostrar as propriedades do documento.</translation>
     </message>
 </context>
 <context>
@@ -185,7 +185,7 @@ editando as categorias.</translation>
     <name>FindDialog</name>
     <message>
         <source>Find</source>
-        <translation type="unfinished"></translation>
+        <translation>Localizar</translation>
     </message>
 </context>
 <context>
@@ -203,31 +203,31 @@ editando as categorias.</translation>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
-        <translation type="unfinished">Localizar</translation>
+        <translation>Localizar</translation>
     </message>
     <message>
         <source>Start Search at:</source>
-        <translation type="unfinished">Começar procura em:</translation>
+        <translation>Começar procura em:</translation>
     </message>
     <message>
         <source>Search Backwards</source>
-        <translation type="unfinished">Procurar p/ trás</translation>
+        <translation>Procurar p/ trás</translation>
     </message>
     <message>
         <source>Find what:</source>
-        <translation type="unfinished">Localizar:</translation>
+        <translation>Localizar:</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished">Categoria:</translation>
+        <translation>Categoria:</translation>
     </message>
     <message>
         <source>Case Sensitive</source>
-        <translation type="unfinished">Sensível a caixa</translation>
+        <translation>Sensível a caixa</translation>
     </message>
     <message>
         <source>Dec 02 01</source>
-        <translation type="unfinished"></translation>
+        <translation>Dez 02 01</translation>
     </message>
 </context>
 <context>
@@ -266,78 +266,78 @@ editando as categorias.</translation>
     </message>
     <message>
         <source>Hard Disk</source>
-        <translation type="unfinished">Disco Rígido</translation>
+        <translation>Disco Rígido</translation>
     </message>
     <message>
         <source>Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Propriedades</translation>
     </message>
 </context>
 <context>
     <name>LnkPropertiesBase</name>
     <message>
         <source>Beam</source>
-        <translation type="unfinished">Enviar</translation>
+        <translation>Enviar</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished">Copia</translation>
+        <translation>Copia</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Nome:</translation>
+        <translation>Nome:</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation type="unfinished">Tipo:</translation>
+        <translation>Tipo:</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">Apagar</translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Fast load (consumes memory)</source>
-        <translation type="unfinished">Carregamento rápido (consome memória)</translation>
+        <translation>Carregamento rápido (consome memória)</translation>
     </message>
     <message>
         <source>Comment:</source>
-        <translation type="unfinished">Comentário:</translation>
+        <translation>Comentário:</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished">Localização</translation>
+        <translation>Localização:</translation>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished">Detalhes</translation>
+        <translation>Detalhes</translation>
     </message>
     <message>
         <source>The media the document resides on.</source>
-        <translation type="unfinished"></translation>
+        <translation>O meio em que o documento reside.</translation>
     </message>
     <message>
         <source>The name of this document.</source>
-        <translation type="unfinished"></translation>
+        <translation>O nome deste documento.</translation>
     </message>
     <message>
         <source>Preload this application so that it is available instantly.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pré-carregue esta aplicação para que ela esteja disponível imediatamente.</translation>
     </message>
     <message>
         <source>Delete this document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar este documento.</translation>
     </message>
     <message>
         <source>Make a copy of this document.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fazer uma cópia deste documento.</translation>
     </message>
     <message>
         <source>Beam this document to another device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Envia este documento para outro dispositivo.</translation>
     </message>
     <message>
         <source>Use custom rotation</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar rotação personalizada</translation>
     </message>
 </context>
 <context>
@@ -351,62 +351,62 @@ editando as categorias.</translation>
     <name>PasswordBase</name>
     <message>
         <source>OK</source>
-        <translation type="unfinished">OK</translation>
+        <translation>OK</translation>
     </message>
     <message>
         <source>Enter passcode</source>
-        <translation type="unfinished">Entre a senha</translation>
+        <translation>Entre a senha</translation>
     </message>
     <message>
         <source>1</source>
-        <translation type="unfinished"></translation>
+        <translation>1</translation>
     </message>
     <message>
         <source>2</source>
-        <translation type="unfinished"></translation>
+        <translation>2</translation>
     </message>
     <message>
         <source>3</source>
-        <translation type="unfinished"></translation>
+        <translation>3</translation>
     </message>
     <message>
         <source>4</source>
-        <translation type="unfinished"></translation>
+        <translation>4</translation>
     </message>
     <message>
         <source>5</source>
-        <translation type="unfinished"></translation>
+        <translation>5</translation>
     </message>
     <message>
         <source>6</source>
-        <translation type="unfinished"></translation>
+        <translation>6</translation>
     </message>
     <message>
         <source>7</source>
-        <translation type="unfinished"></translation>
+        <translation>7</translation>
     </message>
     <message>
         <source>8</source>
-        <translation type="unfinished"></translation>
+        <translation>8</translation>
     </message>
     <message>
         <source>9</source>
-        <translation type="unfinished"></translation>
+        <translation>9</translation>
     </message>
     <message>
         <source>0</source>
-        <translation type="unfinished"></translation>
+        <translation>0</translation>
     </message>
 </context>
 <context>
     <name>QMessageBox</name>
     <message>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>Sim</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>Não</translation>
     </message>
 </context>
 <context>
@@ -751,123 +751,140 @@ tente novamente.</translation>
     </message>
     <message>
         <source>New Document</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo Documento</translation>
     </message>
     <message>
         <source>Mon</source>
-        <translation type="unfinished">Seg</translation>
+        <translation>Seg</translation>
     </message>
     <message>
         <source>Tue</source>
-        <translation type="unfinished">Ter</translation>
+        <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
-        <translation type="unfinished">Qua</translation>
+        <translation>Qua</translation>
     </message>
     <message>
         <source>Thu</source>
-        <translation type="unfinished">Qui</translation>
+        <translation>Qui</translation>
     </message>
     <message>
         <source>Fri</source>
-        <translation type="unfinished">Sex</translation>
+        <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
-        <translation type="unfinished">Sab</translation>
+        <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
-        <translation type="unfinished">Dom</translation>
+        <translation>Dom</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique para fechar esta janela descartando as mudanças.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique para fechar esta janela.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique para fechar esta janela e salvar as mudanças.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique para tornar esta janela móvel.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
-        <translation type="unfinished"></translation>
+        <translation>Marque para que esta janela ocupe toda a área da tela.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Qt&gt;Ajuda completa não está disponível para esta aplicação, porém existe ajuda sensível ao contexto.&lt;p&gt;Para usar a ajuda sensível ao contexto:&lt;p&gt;&lt;ol&gt;&lt;li&gt;clique e segure no botão de ajuda.&lt;li&gt;quando a barra de título mostrar &lt;b&gt;O que é isto...&lt;/b&gt;, clique em qualquer controle.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
-        <translation type="unfinished"></translation>
+        <translation>O que é isso...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;qt&gt;Tem certeza que você deseja apagar
+%1?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Jan</source>
-        <translation type="unfinished"></translation>
+        <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
-        <translation type="unfinished"></translation>
+        <translation>Fev</translation>
     </message>
     <message>
         <source>Mar</source>
-        <translation type="unfinished"></translation>
+        <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
-        <translation type="unfinished"></translation>
+        <translation>Abr</translation>
     </message>
     <message>
         <source>May</source>
-        <translation type="unfinished"></translation>
+        <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
-        <translation type="unfinished"></translation>
+        <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
-        <translation type="unfinished"></translation>
+        <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
-        <translation type="unfinished"></translation>
+        <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
-        <translation type="unfinished"></translation>
+        <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
-        <translation type="unfinished"></translation>
+        <translation>Out</translation>
     </message>
     <message>
         <source>Nov</source>
-        <translation type="unfinished"></translation>
+        <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
-        <translation type="unfinished"></translation>
+        <translation>Dez</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Erro</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation>Impossível localizar a aplicação</translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation>Impossível iniciar a aplicação</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 documento</translation>
     </message>
 </context>
 <context>
@@ -894,30 +911,31 @@ tente novamente.</translation>
     </message>
     <message>
         <source>Internal Memory</source>
-        <translation type="unfinished"></translation>
+        <translation>Memória Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
-        <translation type="unfinished"></translation>
+        <translation>Cartão MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum</translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
     <message>
         <source>citytime executable not found</source>
-        <translation type="unfinished"></translation>
+        <translation>executável citytime não encontrado</translation>
     </message>
     <message>
         <source>In order to choose the time zones,
 please install citytime.</source>
-        <translation type="unfinished"></translation>
+        <translation>paraselecionar o fuso-horário,
+instale o aplicativo citytime.</translation>
     </message>
 </context>
 <context>
@@ -937,20 +955,20 @@ Por Favor libere algum espaço e tente novamente</translation>
     <name>TypeCombo</name>
     <message>
         <source>%1 files</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 arquivos</translation>
     </message>
     <message>
         <source>%1 %2</source>
         <comment>minor mimetype / major mimetype</comment>
-        <translation type="unfinished"></translation>
+        <translation>%1 %2</translation>
     </message>
     <message>
         <source>All %1 files</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos os %1 arquivos</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation type="unfinished"></translation>
+        <translation>Todos os arquivos</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libsuspendapplet.ts b/i18n/pt_BR/libsuspendapplet.ts
index bdfb04c..1fdf6e9 100644
--- a/i18n/pt_BR/libsuspendapplet.ts
+++ b/i18n/pt_BR/libsuspendapplet.ts
@@ -3,11 +3,11 @@
     <name>SuspendApplet</name>
     <message>
         <source>Suspend shortcut</source>
-        <translation type="unfinished"></translation>
+        <translation>Atalho para suspender</translation>
     </message>
     <message>
         <source>Suspend</source>
-        <translation type="unfinished"></translation>
+        <translation>Suspender</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/mailit.ts b/i18n/pt_BR/mailit.ts
index 3d729bc..fd9657c 100644
--- a/i18n/pt_BR/mailit.ts
+++ b/i18n/pt_BR/mailit.ts
@@ -200,6 +200,19 @@ Check user name and password&lt;/qt&gt;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/pt_BR/opieftp.ts b/i18n/pt_BR/opieftp.ts
index d26fd96..90673f3 100644
--- a/i18n/pt_BR/opieftp.ts
+++ b/i18n/pt_BR/opieftp.ts
@@ -232,5 +232,9 @@ It must be empty</source>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/qpe.ts b/i18n/pt_BR/qpe.ts
index 16f631a..775b84d 100644
--- a/i18n/pt_BR/qpe.ts
+++ b/i18n/pt_BR/qpe.ts
@@ -1,7 +1,22 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>AppMonitor</name>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
@@ -14,61 +29,85 @@
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Calibrate</name>
     <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Welcome to Opie</source>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
     <message>
-        <source>Documents</source>
+        <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Icon View</source>
+        <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>List View</source>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DesktopApplication</name>
+    <name>DesktopPowerAlerter</name>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
+        <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery is running very low.</source>
+        <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>FirstUse</name>
     <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
+        <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>business card</source>
+        <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -79,6 +118,10 @@ Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
@@ -91,22 +134,33 @@ Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Finding documents</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching documents</source>
+        <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>LauncherView</name>
+    <name>LauncherTabWidget</name>
     <message>
-        <source>%1 files</source>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LauncherView</name>
     <message>
-        <source>All types of file</source>
+        <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -115,70 +169,92 @@ Please charge the back-up battery.</source>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
+    <name>SafeMode</name>
     <message>
-        <source>Medium inserted</source>
+        <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Which media files</source>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Audio</source>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
+        <source>Battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Video</source>
+        <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link apps</source>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Limit search to dir: (not used yet)</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add</source>
+        <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Your decision will be stored on the medium.</source>
+        <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do not ask again for this medium</source>
+        <source>Memory Low
+Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Battery Status</source>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
+        <source>Shutdown...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -207,10 +283,6 @@ These termination options are provided primarily for use while developing and te
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
@@ -239,15 +311,23 @@ These termination options are provided primarily for use while developing and te
     <name>SyncDialog</name>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="unfinished">&lt;b&gt;Contatos&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Contatos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation type="unfinished">&amp;Cancelar</translation>
+        <translation type="obsolete">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Syncing</source>
-        <translation type="unfinished">Sincronizando</translation>
+        <translation type="obsolete">Sincronizando</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/showimg.ts b/i18n/pt_BR/showimg.ts
index c68112d..e28a330 100644
--- a/i18n/pt_BR/showimg.ts
+++ b/i18n/pt_BR/showimg.ts
@@ -122,6 +122,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/pt_BR/textedit.ts b/i18n/pt_BR/textedit.ts
index 20cc58f..f95aa03 100644
--- a/i18n/pt_BR/textedit.ts
+++ b/i18n/pt_BR/textedit.ts
@@ -144,7 +144,7 @@
     </message>
     <message>
         <source>Unnamed</source>
-        <translation type="unfinished">Sem Nome</translation>
+        <translation>Sem Nome</translation>
     </message>
     <message>
         <source>Permissions</source>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index 5176e27..c3ff910 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -4,144 +4,144 @@
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation>Ok</translation>
     </message>
     <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h1&gt;Alarme às %1&lt;/h1&gt;&lt;br&gt;</translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
-        <translation type="unfinished"></translation>
+        <translation>Alarmes</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Informação</translation>
     </message>
     <message>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado</translation>
     </message>
     <message>
         <source>Recurrence</source>
-        <translation type="unfinished"></translation>
+        <translation>Recorrente</translation>
     </message>
     <message>
         <source>Task Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor de Tarefas</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
-        <translation type="unfinished"></translation>
+        <translation>Entre a Tarefa</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation type="unfinished">Editar Tarefa</translation>
+        <translation>Editar Tarefa</translation>
     </message>
     <message>
         <source>silent</source>
-        <translation type="unfinished"></translation>
+        <translation>silencioso</translation>
     </message>
     <message>
         <source>loud</source>
-        <translation type="unfinished"></translation>
+        <translation>alto</translation>
     </message>
     <message>
         <source>Opie Todolist</source>
-        <translation type="unfinished"></translation>
+        <translation>Opie Lista de Tarefas</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>New from template</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo apartir do modelo</translation>
     </message>
     <message>
         <source>New Task</source>
-        <translation type="unfinished">Nova Tarefa</translation>
+        <translation>Nova Tarefa</translation>
     </message>
     <message>
         <source>Click here to create a new task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para criar nova tarefa.</translation>
     </message>
     <message>
         <source>Edit Task</source>
-        <translation type="unfinished">Editar Tarefa</translation>
+        <translation>Editar Tarefa</translation>
     </message>
     <message>
         <source>Click here to modify the current task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para alterar a recursão da tarefa.</translation>
     </message>
     <message>
         <source>View Task</source>
-        <translation type="unfinished"></translation>
+        <translation>Ver Tarefa</translation>
     </message>
     <message>
         <source>Delete...</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar...</translation>
     </message>
     <message>
         <source>Click here to remove the current task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para remover a tarefa atual.</translation>
     </message>
     <message>
         <source>Delete all...</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar tudo...</translation>
     </message>
     <message>
         <source>Delete completed</source>
-        <translation type="unfinished"></translation>
+        <translation>Remoção completada</translation>
     </message>
     <message>
         <source>Beam</source>
-        <translation type="unfinished">Enviar</translation>
+        <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the current task to another device.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para enviar a tarefa atual para outro dispositivo.</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation type="unfinished">Localizar</translation>
+        <translation>Localizar</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar tarefas completadas</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar apenas tarefas atrasadas</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar prazos das tarefas</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Mostrar barra de tarefas rápida</translation>
     </message>
     <message>
         <source>Data</source>
-        <translation type="unfinished"></translation>
+        <translation>Dados</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation type="unfinished"></translation>
+        <translation>Categoria</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Opções</translation>
     </message>
     <message>
         <source>QuickEdit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editção Rápida</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
@@ -151,15 +151,21 @@ The list displays the following information:
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Esta é uma lista de todas as tarefas atuais.
+
+A lista mostra as seguintes informações:
+1. Completa - Uma marca de checagem verde indica tarefa completa.  Clique aqui para completar uma tarefa.
+2. Prioridade - uma representação gráfica da prioridade da tarefa. Duplo-clique aqui para modificar.
+3. Descrição - Descrição da tarefa.  Clique aqui para selecionar a tarefa.
+4. Prazo - mostra quando a tarefa deve estar terminada.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar prazos das tarefas&apos; no menu acima.</translation>
     </message>
     <message>
         <source>All Categories</source>
-        <translation type="unfinished"></translation>
+        <translation>Todas as Categorias</translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation type="unfinished">Sem Espaço</translation>
+        <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Todo was unable
@@ -168,7 +174,7 @@ Free up some space
 and try again.
 
 Quit Anyway?</source>
-        <translation type="unfinished">Tarefas não pode
+        <translation>Tarefas não pode
 salvar suas mudanças.
 Libere algum espaço
 e tente novamente.
@@ -177,7 +183,7 @@ Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Todo</source>
-        <translation type="unfinished">Tarefas</translation>
+        <translation>Tarefas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
@@ -185,75 +191,75 @@ Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>all tasks?</source>
-        <translation type="unfinished"></translation>
+        <translation>todas as tarefas?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
-        <translation type="unfinished"></translation>
+        <translation>todas as tarefas completadas?</translation>
     </message>
     <message>
         <source>Unfiled</source>
-        <translation type="unfinished"></translation>
+        <translation>Não preenchido</translation>
     </message>
     <message>
         <source>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;P&gt;%1 novas tarefas chegaram.&lt;p&gt;Gostaria de adicioná-las as sua Lista de Tarefas ?</translation>
     </message>
     <message>
         <source>New Tasks</source>
-        <translation type="unfinished"></translation>
+        <translation>Tarefas Novas</translation>
     </message>
     <message>
         <source>Duplicate</source>
-        <translation type="unfinished"></translation>
+        <translation>Duplicar</translation>
     </message>
     <message>
         <source>C.</source>
-        <translation type="unfinished">C.</translation>
+        <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
-        <translation type="unfinished"></translation>
+        <translation>Prioridade</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Descrição</translation>
+        <translation>Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
-        <translation type="unfinished"></translation>
+        <translation>Prazo</translation>
     </message>
     <message>
         <source>Configure Templates</source>
-        <translation type="unfinished"></translation>
+        <translation>Configurar Modelos</translation>
     </message>
     <message>
         <source>Priority:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Template Editor</source>
-        <translation type="unfinished"></translation>
+        <translation>Editor de Modelo</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation type="unfinished"></translation>
+        <translation>Remover</translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>New Template %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo Modelo %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
@@ -261,7 +267,11 @@ Sair assim mesmo ?</translation>
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mudar a prioridade de uma nova tarefa.
+
+Esta área é chamada de barra de tarefas rápida.
+
+Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
@@ -269,11 +279,15 @@ It allows you to quickly add a new task to your list.  This area can be shown or
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entre com a descrição de uma nova tarefa aqui.
+
+Esta área é chamada de barra de tarefas rápida.
+
+Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>More</source>
-        <translation type="unfinished"></translation>
+        <translation>Mais</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
@@ -281,11 +295,15 @@ It allows you to quickly add a new task to your list.  This area can be shown or
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para inserir informações adicionais para uma nova tarefa.
+
+Esta área é chamada de barra de tarefas rápida.
+
+Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>Enter</source>
-        <translation type="unfinished"></translation>
+        <translation>Entrar</translation>
     </message>
     <message>
         <source>Click here to add new task.
@@ -293,11 +311,15 @@ It allows you to quickly add a new task to your list.  This area can be shown or
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para adicionar uma nova tarefa.
+
+Esta área é chamada de barra de tarefas rápida.
+
+Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Cancelar</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
@@ -305,287 +327,291 @@ It allows you to quickly add a new task to your list.  This area can be shown or
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para limpar as informações de uma nova tarefa.
+
+Esta área é chamada de barra de tarefas rápida.
+
+Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
-        <translation type="unfinished"></translation>
+        <translation>Dados não podem ser editados. Sincronização em andamento</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
-        <translation type="unfinished"></translation>
+        <translation>Dados não podem ser editados. Sincronização em andamento</translation>
     </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
-        <translation type="unfinished"></translation>
+        <translation>Visão em tabela</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>Nenhum</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 dia(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Apagar</translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Data</translation>
     </message>
     <message>
         <source>Time</source>
-        <translation type="unfinished"></translation>
+        <translation>hora</translation>
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
-        <translation type="unfinished"></translation>
+        <translation>Descrição:</translation>
     </message>
     <message>
         <source>Enter brief description of the task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entre um breve descrição da tarefa aqui.</translation>
     </message>
     <message>
         <source>Complete </source>
-        <translation type="unfinished"></translation>
+        <translation>Completa</translation>
     </message>
     <message>
         <source>Work on </source>
-        <translation type="unfinished"></translation>
+        <translation>Trabalhar em</translation>
     </message>
     <message>
         <source>Buy </source>
-        <translation type="unfinished"></translation>
+        <translation>Comprar</translation>
     </message>
     <message>
         <source>Organize </source>
-        <translation type="unfinished"></translation>
+        <translation>Organizar</translation>
     </message>
     <message>
         <source>Get </source>
-        <translation type="unfinished"></translation>
+        <translation>Obter</translation>
     </message>
     <message>
         <source>Update </source>
-        <translation type="unfinished"></translation>
+        <translation>Atualizar</translation>
     </message>
     <message>
         <source>Create </source>
-        <translation type="unfinished"></translation>
+        <translation>Criar</translation>
     </message>
     <message>
         <source>Plan </source>
-        <translation type="unfinished"></translation>
+        <translation>Planejar</translation>
     </message>
     <message>
         <source>Call </source>
-        <translation type="unfinished"></translation>
+        <translation>Chamar</translation>
     </message>
     <message>
         <source>Mail </source>
-        <translation type="unfinished"></translation>
+        <translation>Correio</translation>
     </message>
     <message>
         <source>Select priority of task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecione Prioridade da tarefa aqui.</translation>
     </message>
     <message>
         <source>Very High</source>
-        <translation type="unfinished"></translation>
+        <translation>Muito Alta</translation>
     </message>
     <message>
         <source>High</source>
-        <translation type="unfinished"></translation>
+        <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
-        <translation type="unfinished"></translation>
+        <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Baixa</translation>
     </message>
     <message>
         <source>Very Low</source>
-        <translation type="unfinished"></translation>
+        <translation>Muito Baixa</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select category to organize this task with.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecione categoria onde incluir esta tarefa.</translation>
     </message>
     <message>
         <source>Recurring task</source>
-        <translation type="unfinished"></translation>
+        <translation>Tarefa recorrente</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui se esta tarefa ocorre regularmente. Se selecionado a frquência poderá ser ajustada na guia de recursão.</translation>
     </message>
     <message>
         <source>Enter any additional information about this task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Entre qualquer informação adicional aqui.</translation>
     </message>
     <message>
         <source>Todo List</source>
-        <translation type="unfinished"></translation>
+        <translation>Lista de Tarefas</translation>
     </message>
     <message>
         <source>Summary:</source>
-        <translation type="unfinished"></translation>
+        <translation>Sumário:</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
-        <translation type="unfinished"></translation>
+        <translation>Estado:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para mudar o estado atual desta tarefa.</translation>
     </message>
     <message>
         <source>Started</source>
-        <translation type="unfinished"></translation>
+        <translation>Iniciada</translation>
     </message>
     <message>
         <source>Postponed</source>
-        <translation type="unfinished"></translation>
+        <translation>Adiada</translation>
     </message>
     <message>
         <source>Finished</source>
-        <translation type="unfinished"></translation>
+        <translation>Terminada</translation>
     </message>
     <message>
         <source>Not started</source>
-        <translation type="unfinished"></translation>
+        <translation>Não Iniciada</translation>
     </message>
     <message>
         <source>Progress:</source>
-        <translation type="unfinished"></translation>
+        <translation>Progresso:</translation>
     </message>
     <message>
         <source>Select progress made on this task here.</source>
-        <translation type="unfinished"></translation>
+        <translation>Selecione o progresso feito nesta tarefa.</translation>
     </message>
     <message>
         <source>0 %</source>
-        <translation type="unfinished"></translation>
+        <translation>0 %</translation>
     </message>
     <message>
         <source>20 %</source>
-        <translation type="unfinished"></translation>
+        <translation>20 %</translation>
     </message>
     <message>
         <source>40 %</source>
-        <translation type="unfinished"></translation>
+        <translation>40 %</translation>
     </message>
     <message>
         <source>60 %</source>
-        <translation type="unfinished"></translation>
+        <translation>60 %</translation>
     </message>
     <message>
         <source>80 %</source>
-        <translation type="unfinished"></translation>
+        <translation>80 %</translation>
     </message>
     <message>
         <source>100 %</source>
-        <translation type="unfinished"></translation>
+        <translation>100 %</translation>
     </message>
     <message>
         <source>Start Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Data de Início:</translation>
     </message>
     <message>
         <source>Click here to set the date this task was started.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para selecionar a data em que esta tarefa foi iniciada.</translation>
     </message>
     <message>
         <source>Due Date:</source>
-        <translation type="unfinished"></translation>
+        <translation>Data para Término:</translation>
     </message>
     <message>
         <source>Click here to set the date this task needs to be completed by.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para selecionar a data em que esta tarefa foi completada.</translation>
     </message>
     <message>
         <source>Completed:</source>
-        <translation type="unfinished"></translation>
+        <translation>Completada:</translation>
     </message>
     <message>
         <source>Click here to mark this task as completed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para marcar esta tarefa como completa.</translation>
     </message>
     <message>
         <source>Click here to set the date this task was completed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para selecionar a data em que esta tarefa foi completada.</translation>
     </message>
     <message>
         <source>Maintainer Mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>Modo de Manutenção:</translation>
     </message>
     <message>
         <source>Click here to set the maintainer&apos;s role.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para selecionar o papel de mantenedor.</translation>
     </message>
     <message>
         <source>Nothing</source>
-        <translation type="unfinished"></translation>
+        <translation>Nada</translation>
     </message>
     <message>
         <source>Responsible</source>
-        <translation type="unfinished"></translation>
+        <translation>Responsável</translation>
     </message>
     <message>
         <source>Done By</source>
-        <translation type="unfinished"></translation>
+        <translation>Feito Por</translation>
     </message>
     <message>
         <source>Coordinating</source>
-        <translation type="unfinished"></translation>
+        <translation>Coordenando</translation>
     </message>
     <message>
         <source>Maintainer:</source>
-        <translation type="unfinished"></translation>
+        <translation>Mantenedor:</translation>
     </message>
     <message>
         <source>This is the name of the current task maintainer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Este é o nome do mantenedor desta tarefa.</translation>
     </message>
     <message>
         <source>test</source>
-        <translation type="unfinished"></translation>
+        <translation>teste</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
-        <translation type="unfinished"></translation>
+        <translation>Clique aqui para selecionar o mantenedor da tarefa.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/advancedfm.ts b/i18n/sl/advancedfm.ts
index 7f57720..d3fde90 100644
--- a/i18n/sl/advancedfm.ts
+++ b/i18n/sl/advancedfm.ts
@@ -39,11 +39,11 @@
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>Preklopi na lokalen</translation>
+        <translation type="obsolete">Preklopi na lokalen</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>Preklopi na oddaljen</translation>
+        <translation type="obsolete">Preklopi na oddaljen</translation>
     </message>
     <message>
         <source>Size</source>
@@ -272,6 +272,26 @@ and all it&apos;s contents ?</source>
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -361,5 +381,9 @@ Finished
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/calculator.ts b/i18n/sl/calculator.ts
index 42e3f07..3d4061b 100644
--- a/i18n/sl/calculator.ts
+++ b/i18n/sl/calculator.ts
@@ -133,4 +133,203 @@
         <translation>Običajen</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished">Običajen</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/datebook.ts b/i18n/sl/datebook.ts
index 28fca49..3cdf201 100644
--- a/i18n/sl/datebook.ts
+++ b/i18n/sl/datebook.ts
@@ -366,14 +366,6 @@ Izhod?</translation>
     </message>
 </context>
 <context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
@@ -544,7 +536,7 @@ Izhod?</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>Začetni čas</translation>
+        <translation type="obsolete">Začetni čas</translation>
     </message>
     <message>
         <source>Time zone</source>
@@ -562,6 +554,10 @@ Izhod?</translation>
         <source>Note...</source>
         <translation>Opombe...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">Začetni čas</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/sl/libbatteryapplet.ts b/i18n/sl/libbatteryapplet.ts
index ce9c4ed..dd8800a 100644
--- a/i18n/sl/libbatteryapplet.ts
+++ b/i18n/sl/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation>Baterija ni vstavljena</translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/libqpe.ts b/i18n/sl/libqpe.ts
index 44ea6b9..1030c88 100644
--- a/i18n/sl/libqpe.ts
+++ b/i18n/sl/libqpe.ts
@@ -861,6 +861,22 @@ Sprostite nekaj spomina in poizkusite ponovno.</translation>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Napaka</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/sl/mailit.ts b/i18n/sl/mailit.ts
index 3d729bc..fd9657c 100644
--- a/i18n/sl/mailit.ts
+++ b/i18n/sl/mailit.ts
@@ -200,6 +200,19 @@ Check user name and password&lt;/qt&gt;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/sl/opieftp.ts b/i18n/sl/opieftp.ts
index 193b136..f985303 100644
--- a/i18n/sl/opieftp.ts
+++ b/i18n/sl/opieftp.ts
@@ -232,5 +232,9 @@ Mora biti prazen</translation>
         <source>Sorry name already taken</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/qpe.ts b/i18n/sl/qpe.ts
index 15ab396..0086e26 100644
--- a/i18n/sl/qpe.ts
+++ b/i18n/sl/qpe.ts
@@ -1,6 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AppMonitor</name>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
@@ -13,61 +28,85 @@
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Calibrate</name>
     <message>
-        <source>Touch the crosshairs firmly and
-accurately to calibrate your screen.</source>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Welcome to Opie</source>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
     <message>
-        <source>Documents</source>
+        <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Icon View</source>
+        <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>List View</source>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DesktopApplication</name>
+    <name>DesktopPowerAlerter</name>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
+        <source>Battery Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery is running very low.</source>
+        <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>FirstUse</name>
     <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
+        <source>&lt;&lt; Back</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>business card</source>
+        <source>Next &gt;&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Information</source>
+        <source>Tap anywhere on the screen to continue.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -78,6 +117,10 @@ Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
@@ -90,22 +133,33 @@ Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Finding documents</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching documents</source>
+        <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>LauncherView</name>
+    <name>LauncherTabWidget</name>
     <message>
-        <source>%1 files</source>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LauncherView</name>
     <message>
-        <source>All types of file</source>
+        <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -114,70 +168,92 @@ Please charge the back-up battery.</source>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
+    <name>SafeMode</name>
     <message>
-        <source>Medium inserted</source>
+        <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Which media files</source>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Audio</source>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Image</source>
+        <source>Battery is running very low. </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Text</source>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Video</source>
+        <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All</source>
+        <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link apps</source>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Limit search to dir: (not used yet)</source>
+        <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add</source>
+        <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Your decision will be stored on the medium.</source>
+        <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do not ask again for this medium</source>
+        <source>Memory Low
+Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>Battery Status</source>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
+        <source>Shutdown...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
@@ -206,10 +282,6 @@ These termination options are provided primarily for use while developing and te
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Shutdown...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
@@ -238,15 +310,23 @@ These termination options are provided primarily for use while developing and te
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>Sinhroniziram</translation>
+        <translation type="obsolete">Sinhroniziram</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Kontakti&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Kontakti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;Prekliči</translation>
+        <translation type="obsolete">&amp;Prekliči</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/showimg.ts b/i18n/sl/showimg.ts
index d61d300..e3587d1 100644
--- a/i18n/sl/showimg.ts
+++ b/i18n/sl/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/xx/advancedfm.ts b/i18n/xx/advancedfm.ts
index 43e7e04..f6d596f 100644
--- a/i18n/xx/advancedfm.ts
+++ b/i18n/xx/advancedfm.ts
@@ -107,11 +107,11 @@
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Size</source>
@@ -257,16 +257,28 @@ and all it&apos;s contents ?</source>
     </message>
     <message>
         <source>AdvancedFm :: </source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> kB free</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Copy &apos;%1&apos; As</source>
         <translation type="obsolete">FOO</translation>
     </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -356,5 +368,9 @@ Finished
         <source>Error setting mode</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/calculator.ts b/i18n/xx/calculator.ts
index e0dde8d..32ea1ae 100644
--- a/i18n/xx/calculator.ts
+++ b/i18n/xx/calculator.ts
@@ -133,4 +133,203 @@
         <translation>FOO</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/datebook.ts b/i18n/xx/datebook.ts
index 1ef712c..f93ea2a 100644
--- a/i18n/xx/datebook.ts
+++ b/i18n/xx/datebook.ts
@@ -364,7 +364,7 @@ Quit anyway?</source>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
@@ -518,7 +518,7 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Start time</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All day</source>
@@ -556,6 +556,10 @@ Quit anyway?</source>
         <source>Note...</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/xx/libbatteryapplet.ts b/i18n/xx/libbatteryapplet.ts
index 9bf2d04..e888b0a 100644
--- a/i18n/xx/libbatteryapplet.ts
+++ b/i18n/xx/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/libqpe.ts b/i18n/xx/libqpe.ts
index 49fb921..ceb3ad5 100644
--- a/i18n/xx/libqpe.ts
+++ b/i18n/xx/libqpe.ts
@@ -851,6 +851,22 @@ Free some memory and try again.</source>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/xx/mailit.ts b/i18n/xx/mailit.ts
index 90d63e6..8833351 100644
--- a/i18n/xx/mailit.ts
+++ b/i18n/xx/mailit.ts
@@ -200,6 +200,19 @@ Check user name and password&lt;/qt&gt;</source>
 </source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/xx/opieftp.ts b/i18n/xx/opieftp.ts
index f57b6e9..ed51ce6 100644
--- a/i18n/xx/opieftp.ts
+++ b/i18n/xx/opieftp.ts
@@ -231,5 +231,9 @@ It must be empty</source>
         <source>Sorry name already taken</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/qpe.ts b/i18n/xx/qpe.ts
index 3952e55..912f512 100644
--- a/i18n/xx/qpe.ts
+++ b/i18n/xx/qpe.ts
@@ -1,17 +1,79 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
@@ -19,26 +81,26 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
@@ -46,207 +108,375 @@ accurately to calibrate your screen.</source>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Information</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Finding documents</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Searching documents</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation>FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/showimg.ts b/i18n/xx/showimg.ts
index 9c6673d..f81d86d 100644
--- a/i18n/xx/showimg.ts
+++ b/i18n/xx/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index 46b51d2..e2f8c34 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -39,11 +39,11 @@
     </message>
     <message>
         <source>Switch to Local</source>
-        <translation>切換至本地端</translation>
+        <translation type="obsolete">切換至本地端</translation>
     </message>
     <message>
         <source>Switch to Remote</source>
-        <translation>切換至遠端</translation>
+        <translation type="obsolete">切換至遠端</translation>
     </message>
     <message>
         <source>Size</source>
@@ -261,6 +261,26 @@ and all it&apos;s contents ?</source>
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>AdvancedFm :: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> kB free</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch to View 2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not Yet Implemented</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
@@ -350,5 +370,9 @@ Finished
         <source>Error setting mode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>filePermissions</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/calculator.ts b/i18n/zh_TW/calculator.ts
index 40deefb..9a36777 100644
--- a/i18n/zh_TW/calculator.ts
+++ b/i18n/zh_TW/calculator.ts
@@ -133,4 +133,203 @@
         <translation>標準</translation>
     </message>
 </context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Standard</source>
+        <translation type="unfinished">標準</translation>
+    </message>
+    <message>
+        <source>Weight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Distance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Temperatures</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Volume</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>acres</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;C</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>carats</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>cu in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&#xb0;F</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>fl oz (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>g</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>gal (US)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>hectares</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>kg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>l</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lg tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mg</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ml</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>naut. mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>oz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>pt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>qt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq cm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq ft</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq in</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq mm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>sq yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>st</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>St tons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tblspoon</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>teaspoons</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tonnes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index a18db60..e8946f4 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -363,14 +363,6 @@ Quit anyway?</translation>
     </message>
 </context>
 <context>
-    <name>DateBookWeekLstDayHdr</name>
-    <message>
-        <source>MTWTFSSM</source>
-        <comment>Week days</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
@@ -478,7 +470,7 @@ Quit anyway?</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation>開始時間</translation>
+        <translation type="obsolete">開始時間</translation>
     </message>
     <message>
         <source>All day</source>
@@ -524,6 +516,10 @@ Quit anyway?</translation>
         <source>Note...</source>
         <translation>備忘錄...</translation>
     </message>
+    <message>
+        <source>Start Time</source>
+        <translation type="unfinished">開始時間</translation>
+    </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
diff --git a/i18n/zh_TW/libbatteryapplet.ts b/i18n/zh_TW/libbatteryapplet.ts
index cbc1577..94fc1e5 100644
--- a/i18n/zh_TW/libbatteryapplet.ts
+++ b/i18n/zh_TW/libbatteryapplet.ts
@@ -81,5 +81,17 @@
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>no data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipaq  </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Jacket  </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index f71ec64..9be9eda 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -861,6 +861,22 @@ Free some memory and try again.</source>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">錯誤</translation>
+    </message>
+    <message>
+        <source>Could not find the application </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not start the application </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/zh_TW/mailit.ts b/i18n/zh_TW/mailit.ts
index 3d729bc..fd9657c 100644
--- a/i18n/zh_TW/mailit.ts
+++ b/i18n/zh_TW/mailit.ts
@@ -200,6 +200,19 @@ Check user name and password&lt;/qt&gt;</source>
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Mailit ! No account defined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete account:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>EmailHandler</name>
diff --git a/i18n/zh_TW/opieftp.ts b/i18n/zh_TW/opieftp.ts
index f105433..c06a8f5 100644
--- a/i18n/zh_TW/opieftp.ts
+++ b/i18n/zh_TW/opieftp.ts
@@ -245,5 +245,9 @@ It must be empty</source>
         <source>Sorry name already taken</source>
         <translation>名稱已經存在</translation>
     </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index fa55075..0eb61fc 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -1,17 +1,79 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>Language</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Time and Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Personal Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AppLauncher</name>
+    <message>
+        <source>Application Problem</source>
+        <translation type="unfinished">應用程式問題</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application terminated</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Application not found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>AppMonitor</name>
     <message>
         <source>Application Problem</source>
-        <translation>應用程式問題</translation>
+        <translation type="obsolete">應用程式問題</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
+        <translation type="obsolete">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
@@ -19,26 +81,26 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
-        <translation>請按下十字架中心以校正觸控筆</translation>
+        <translation type="obsolete">請按下十字架中心以校正觸控筆</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
-        <translation>歡迎進入Opie</translation>
+        <translation type="obsolete">歡迎進入Opie</translation>
     </message>
 </context>
 <context>
     <name>CategoryTabWidget</name>
     <message>
         <source>Documents</source>
-        <translation>文件</translation>
+        <translation type="obsolete">文件</translation>
     </message>
     <message>
         <source>Icon View</source>
-        <translation>圖示瀏覽</translation>
+        <translation type="obsolete">圖示瀏覽</translation>
     </message>
     <message>
         <source>List View</source>
-        <translation>列表瀏覽</translation>
+        <translation type="obsolete">列表瀏覽</translation>
     </message>
 </context>
 <context>
@@ -46,58 +108,126 @@ accurately to calibrate your screen.</source>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>低電量警告! 
+        <translation type="obsolete">低電量警告! 
 請把電源關掉直到插上插座</translation>
     </message>
     <message>
         <source>Battery is running very low.</source>
-        <translation>低電量</translation>
+        <translation type="obsolete">低電量</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>低電量警告.
+        <translation type="obsolete">低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
-        <translation>business card </translation>
+        <translation type="obsolete">business card </translation>
     </message>
     <message>
         <source>Information</source>
-        <translation type="unfinished">訊息</translation>
+        <translation type="obsolete">訊息</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="unfinished">&lt;p&gt;The system date doesn&apos;t seem to be valid.
+        <translation type="obsolete">&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
     </message>
 </context>
 <context>
+    <name>DesktopPowerAlerter</name>
+    <message>
+        <source>Battery Status</source>
+        <translation type="unfinished">電池狀態</translation>
+    </message>
+    <message>
+        <source>Low Battery</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FirstUse</name>
+    <message>
+        <source>&lt;&lt; Back</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Next &gt;&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tap anywhere on the screen to continue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait, loading %1 settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please wait...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FirstUseBackground</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
-        <translation>啟動器</translation>
+        <translation type="unfinished">啟動器</translation>
     </message>
     <message>
         <source> - Launcher</source>
-        <translation> - 啟動器</translation>
+        <translation type="unfinished"> - 啟動器</translation>
     </message>
     <message>
         <source>No application</source>
-        <translation>無應用程式</translation>
+        <translation type="unfinished">無應用程式</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
-        <translation>&lt;p&gt;沒有可開啟此文件的應用程式&lt;p&gt;Type is %1.</translation>
+        <translation type="unfinished">&lt;p&gt;沒有可開啟此文件的應用程式&lt;p&gt;Type is %1.</translation>
+    </message>
+    <message>
+        <source>Documents</source>
+        <translation type="unfinished">文件</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Finding documents</source>
+        <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LauncherTabWidget</name>
+    <message>
+        <source>Icon View</source>
+        <translation type="unfinished">圖示瀏覽</translation>
+    </message>
+    <message>
+        <source>List View</source>
+        <translation type="unfinished">列表瀏覽</translation>
+    </message>
     <message>
-        <source>Searching documents</source>
+        <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -105,152 +235,247 @@ Please charge the back-up battery.</source>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
-        <translation>%1 檔案</translation>
+        <translation type="obsolete">%1 檔案</translation>
     </message>
     <message>
         <source>All types of file</source>
-        <translation>所有類型檔案</translation>
+        <translation type="obsolete">所有類型檔案</translation>
     </message>
     <message>
         <source>Document View</source>
-        <translation>文件瀏覽</translation>
+        <translation type="unfinished">文件瀏覽</translation>
+    </message>
+    <message>
+        <source>All types</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
-        <translation>中間插入</translation>
+        <translation type="obsolete">中間插入</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
+        <translation type="obsolete">A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
     </message>
     <message>
         <source>Which media files</source>
-        <translation>Which media files</translation>
+        <translation type="obsolete">Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
-        <translation>音效</translation>
+        <translation type="obsolete">音效</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation>圖形</translation>
+        <translation type="obsolete">圖形</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>文字</translation>
+        <translation type="obsolete">文字</translation>
     </message>
     <message>
         <source>Video</source>
-        <translation>影像</translation>
+        <translation type="obsolete">影像</translation>
     </message>
     <message>
         <source>All</source>
-        <translation>所有</translation>
+        <translation type="obsolete">所有</translation>
     </message>
     <message>
         <source>Link apps</source>
-        <translation>連結程式</translation>
+        <translation type="obsolete">連結程式</translation>
     </message>
     <message>
         <source>Limit search to dir: (not used yet)</source>
-        <translation>Limit search to dir: (not used yet)</translation>
+        <translation type="obsolete">Limit search to dir: (not used yet)</translation>
     </message>
     <message>
         <source>Add</source>
-        <translation>加入</translation>
+        <translation type="obsolete">加入</translation>
     </message>
     <message>
         <source>Your decision will be stored on the medium.</source>
-        <translation>你的決定將存在儲存媒体當中</translation>
+        <translation type="obsolete">你的決定將存在儲存媒体當中</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
-        <translation>不再詢問這一個儲存媒体</translation>
+        <translation type="obsolete">不再詢問這一個儲存媒体</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
-        <translation type="unfinished">電池狀態</translation>
+        <translation type="obsolete">電池狀態</translation>
+    </message>
+</context>
+<context>
+    <name>SafeMode</name>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restart Qtopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ServerApplication</name>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished">訊息</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
+        <translation type="unfinished">&lt;p&gt;The system date doesn&apos;t seem to be valid.
+(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Battery level is critical!
+Keep power off until power restored!</source>
+        <translation type="unfinished">低電量警告! 
+請把電源關掉直到插上插座</translation>
+    </message>
+    <message>
+        <source>The Back-up battery is very low.
+Please charge the back-up battery.</source>
+        <translation type="unfinished">低電量警告.
+請換上備份電池</translation>
+    </message>
+    <message>
+        <source>business card</source>
+        <translation type="unfinished">business card </translation>
+    </message>
+    <message>
+        <source>Battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Safe Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Plugin Manager...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Low
+Please save data.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Critical Memory Shortage
+Please end this application
+immediately.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
-        <translation>終止</translation>
+        <translation type="unfinished">終止</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
-        <translation>終止Opie</translation>
+        <translation type="unfinished">終止Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
-        <translation>重開機</translation>
+        <translation type="unfinished">重開機</translation>
     </message>
     <message>
         <source>Restart Opie</source>
-        <translation>重新啟動Opie</translation>
+        <translation type="unfinished">重新啟動Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
-        <translation>關機</translation>
+        <translation type="unfinished">關機</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation>&lt;p&gt;
+        <translation type="unfinished">&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation>取消</translation>
+        <translation type="unfinished">取消</translation>
     </message>
     <message>
         <source>Shutdown...</source>
-        <translation>關機..</translation>
+        <translation type="unfinished">關機..</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
-        <translation>同步連結</translation>
+        <translation type="unfinished">同步連結</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</translation>
+        <translation type="unfinished">&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</translation>
     </message>
     <message>
         <source>Deny</source>
-        <translation>沒有權限</translation>
+        <translation type="unfinished">沒有權限</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
-        <translation>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</translation>
+        <translation type="unfinished">&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</translation>
     </message>
     <message>
         <source>Allow</source>
-        <translation>淮許</translation>
+        <translation type="unfinished">淮許</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
-        <translation>同步中</translation>
+        <translation type="obsolete">同步中</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation>&lt;b&gt;連結&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;連結&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
-        <translation>&amp;取消</translation>
+        <translation type="obsolete">&amp;取消</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syncing:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/showimg.ts b/i18n/zh_TW/showimg.ts
index c56dee3..270696a 100644
--- a/i18n/zh_TW/showimg.ts
+++ b/i18n/zh_TW/showimg.ts
@@ -121,6 +121,36 @@
     </message>
 </context>
 <context>
+    <name>InfoDialog</name>
+    <message>
+        <source>File Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Format</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alpha</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+</context>
+<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>