Arrrgh-Why the heck have translations disappeared I had committed weeks ago ?

199 translations vanished in opie-console alone *yawn*

OK, added a few ones and improved a few others.

27 files changed, 689 insertions, 607 deletions

diff --git a/i18n/da/datebook.ts b/i18n/da/datebook.ts
index 3c310d2..6a3c742 100644
--- a/i18n/da/datebook.ts
+++ b/i18n/da/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Vis</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Opsætning</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Idag</translation>
     </message>
     <message>
@@ -219,16 +211,20 @@ Afslut alligevel?</translation>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished">Kalender</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
@@ -314,67 +310,75 @@ Afslut alligevel?</translation>
     <message>
         <source>Start</source>
         <translation type="unfinished">Start</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished">Kontor</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">Hjemme</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Denne begivenhed varer hele dagen.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
-        <translation type="unfinished">uge</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation>Å: </translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation>U: </translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
-        <translation>U: %1</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>U: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation>00 Jan-00 Jan</translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>M</translation>
     </message>
diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index e0f57d4..25c39ff 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -169,25 +169,25 @@ Wollen Sie sie trotzdem öffnen ?</translation>
 hinzufügen?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Ja, alle</translation>
     </message>
     <message>
         <source>Export vCard</source>
-        <translation type="unfinished"></translation>
+        <translation>vCard exportieren</translation>
     </message>
     <message>
         <source>You have to select a contact !</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie müssen einen Eintrag auswählen !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie müssen einen Dateinamen angeben !</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Query Style</source>
         <translation>Eingabemuster</translation>
     </message>
@@ -333,33 +333,35 @@ ist frei erhältlich !</translation>
         <translation>Entfrnen des gewählten Elements aus der oberen Liste</translation>
     </message>
     <message>
         <source>Order (up -&gt; down) defines the primary contact shown in the second column of the list view</source>
         <translation>Reihenfolge (von oben nach unten) definiert den primären Kontakt der in der rechten Spalte angezeigt wird</translation>
     </message>
     <message>
         <source>Tool-/Menubar</source>
-        <translation type="unfinished"></translation>
+        <translation>Werkzeug-/Menuleiste</translation>
     </message>
     <message>
         <source>Fixed</source>
-        <translation type="unfinished"></translation>
+        <translation>Fixiert</translation>
     </message>
     <message>
         <source>Switch to fixed menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
+        <translation>Schalter für fixierte Werkzeugleiste - 
+wird nach dem Neustart der Anwendung aktiv!</translation>
     </message>
     <message>
         <source>Movable</source>
-        <translation type="unfinished"></translation>
+        <translation>Beweglich</translation>
     </message>
     <message>
         <source>Switch to moveable menu-/toolbars after restarting application !</source>
-        <translation type="unfinished"></translation>
+        <translation>Schalter für bewegliche Werkzeugleiste - 
+wird nach dem Neustart der Anwendung aktiv!</translation>
     </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>First Name</source>
         <translation>Vorname</translation>
     </message>
diff --git a/i18n/de/appearance.ts b/i18n/de/appearance.ts
index aee41dd..64ba9f7 100644
--- a/i18n/de/appearance.ts
+++ b/i18n/de/appearance.ts
@@ -219,17 +219,17 @@ Dieser Bereich erlaubt anwendungsspezifische Eigenschaften auszuschalten.</trans
         <translation>Dies ist das Vorschaufenster. Hier können Sie sehen, wie das neue Erscheinungsbild durch Ihre Änderungen beeinflusst wird.</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Erscheinungsbild-Einstellungen</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
-        <translation type="unfinished"></translation>
+        <translation>Rotationsrichtung: </translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Schema editieren</translation>
     </message>
diff --git a/i18n/de/aqpkg.ts b/i18n/de/aqpkg.ts
index a9053a8..565a081 100644
--- a/i18n/de/aqpkg.ts
+++ b/i18n/de/aqpkg.ts
@@ -1,18 +1,18 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
-        <translation type="unfinished">Kategorienfilter</translation>
+        <translation>Kategorienfilter</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie eine oder mehrere Gruppen</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
     <message>
         <source>Reading configuration...</source>
         <translation>Lese Konfiguration ...</translation>
     </message>
@@ -32,127 +32,131 @@
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
         <source>Remove
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Entfernen
+</translation>
     </message>
     <message>
         <source>Install
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Installieren
+</translation>
     </message>
     <message>
         <source>Upgrade
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualisieren
+</translation>
     </message>
     <message>
         <source>(ReInstall)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Neuinstallation)</translation>
     </message>
     <message>
         <source>(Upgrade)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Aktualisierung)</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished">Ziel</translation>
+        <translation>Ziel</translation>
     </message>
     <message>
         <source>Space Avail</source>
-        <translation type="unfinished">Verf. Speicher</translation>
+        <translation>Verf. Speicher</translation>
     </message>
     <message>
         <source>Output</source>
-        <translation type="unfinished">Ausgabe</translation>
+        <translation>Ausgabe</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished">Starten</translation>
+        <translation>Starten</translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Optionen</translation>
     </message>
     <message>
         <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>Text</translation>
     </message>
     <message>
         <source>Abort</source>
-        <translation type="unfinished"></translation>
+        <translation>Abbruch</translation>
     </message>
     <message>
         <source>
 **** User Clicked ABORT ***</source>
-        <translation type="unfinished"></translation>
+        <translation>
+**** Benutzerabbruch ****</translation>
     </message>
     <message>
         <source>**** Process Aborted ****</source>
-        <translation type="unfinished"></translation>
+        <translation>**** Vorgang abgebrochen ****</translation>
     </message>
     <message>
         <source>Save output</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgabe speichern</translation>
     </message>
     <message>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>Unbekannt</translation>
     </message>
 </context>
 <context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Optionen</translation>
     </message>
     <message>
         <source>Force Depends</source>
-        <translation type="unfinished">--force.depends</translation>
+        <translation>--force.depends</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
-        <translation type="unfinished">--force-reinstall</translation>
+        <translation>--force-reinstall</translation>
     </message>
     <message>
         <source>Force Remove</source>
-        <translation type="unfinished">--force-removal</translation>
+        <translation>--force-removal</translation>
     </message>
     <message>
         <source>Force Overwrite</source>
-        <translation type="unfinished">--force-overwrite</translation>
+        <translation>--force-overwrite</translation>
     </message>
     <message>
         <source>Information Level</source>
-        <translation type="unfinished"></translation>
+        <translation>Informationslevel</translation>
     </message>
     <message>
         <source>Errors only</source>
-        <translation type="unfinished"></translation>
+        <translation>Nur Fehler</translation>
     </message>
     <message>
         <source>Normal messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Normale Meldungen</translation>
     </message>
     <message>
         <source>Informative messages</source>
-        <translation type="unfinished"></translation>
+        <translation>Informative Meldungen</translation>
     </message>
     <message>
         <source>Troubleshooting output</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgaben zur Fehlersuche</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>AQPkg - Package Manager</source>
         <translation>AQPkg- der Paketmanager</translation>
     </message>
@@ -455,134 +459,134 @@ löschen oder aktualisieren ?</translation>
         <translation>Löschen oder Aktualisieren</translation>
     </message>
     <message>
         <source>U</source>
         <translation>U</translation>
     </message>
     <message>
         <source>Updating Launcher...</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualisiere Launcher...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;Bechreibung&lt;/B&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Installiert&lt;/B&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Size&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Größe&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Section&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Sektion&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Filename&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Dateiname&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Installed&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Installiete Version&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Version Available&lt;/b&gt; - </source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;p&gt;&lt;b&gt;Verfügbare Version&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>Package Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Paketinformation</translation>
     </message>
     <message>
         <source>Package information is unavailable</source>
-        <translation type="unfinished"></translation>
+        <translation>Paketinformation nicht verfügbar</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation type="unfinished">Schliessen</translation>
+        <translation>Schliessen</translation>
     </message>
 </context>
 <context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
-        <translation type="unfinished">Konfiguration</translation>
+        <translation>Konfiguration</translation>
     </message>
     <message>
         <source>Servers</source>
-        <translation type="unfinished">Server</translation>
+        <translation>Server</translation>
     </message>
     <message>
         <source>Destinations</source>
-        <translation type="unfinished">Ziele</translation>
+        <translation>Ziele</translation>
     </message>
     <message>
         <source>Proxies</source>
-        <translation type="unfinished">Proxys</translation>
+        <translation>Proxys</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished">Neu</translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Löschen</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation>Server</translation>
     </message>
     <message>
         <source>Name:</source>
-        <translation type="unfinished">Name: </translation>
+        <translation>Name: </translation>
     </message>
     <message>
         <source>Address:</source>
-        <translation type="unfinished"></translation>
+        <translation>Adresse:</translation>
     </message>
     <message>
         <source>Active Server</source>
-        <translation type="unfinished">Aktive Server</translation>
+        <translation>Aktive Server</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktualisierung</translation>
     </message>
     <message>
         <source>Destination</source>
-        <translation type="unfinished">Ziel</translation>
+        <translation>Ziel</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>Ort:</translation>
     </message>
     <message>
         <source>Link to root</source>
-        <translation type="unfinished"></translation>
+        <translation>Mit Root verlinken</translation>
     </message>
     <message>
         <source>HTTP Proxy</source>
-        <translation type="unfinished">HTTP Proxy</translation>
+        <translation>HTTP Proxy</translation>
     </message>
     <message>
         <source>Enabled</source>
-        <translation type="unfinished">Aktiviert</translation>
+        <translation>Aktiviert</translation>
     </message>
     <message>
         <source>FTP Proxy</source>
-        <translation type="unfinished">FTP Proxy</translation>
+        <translation>FTP Proxy</translation>
     </message>
     <message>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzername:</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>Passwort:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/datebook.ts b/i18n/de/datebook.ts
index 404e390..22dc590 100644
--- a/i18n/de/datebook.ts
+++ b/i18n/de/datebook.ts
@@ -2,24 +2,16 @@
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Ansicht</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
@@ -97,17 +89,17 @@ Trozdem beenden?</translation>
         <translation>Weiter</translation>
     </message>
     <message>
         <source>Duplicate Event</source>
         <translation>Termin duplizieren</translation>
     </message>
     <message>
         <source>Edit...</source>
-        <translation type="unfinished"></translation>
+        <translation>Editieren...</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
@@ -219,16 +211,20 @@ Trozdem beenden?</translation>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation>Kalender</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Voreinstellungen</translation>
     </message>
     <message>
@@ -272,109 +268,117 @@ Trozdem beenden?</translation>
         <translation>Medium</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Views</source>
-        <translation type="unfinished"></translation>
+        <translation>Ansichten</translation>
     </message>
     <message>
         <source>Default view:</source>
-        <translation type="unfinished"></translation>
+        <translation>Defaultansicht:</translation>
     </message>
     <message>
         <source>Day</source>
-        <translation type="unfinished">Tag</translation>
+        <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
-        <translation type="unfinished">Woche</translation>
+        <translation>Woche</translation>
     </message>
     <message>
         <source>Week List</source>
-        <translation type="unfinished"></translation>
+        <translation>Wochenliste</translation>
     </message>
     <message>
         <source>Month</source>
-        <translation type="unfinished">Monat</translation>
+        <translation>Monat</translation>
     </message>
     <message>
         <source>Jump to current time</source>
-        <translation type="unfinished"></translation>
+        <translation>Sprung zu &quot;jetzt&quot;</translation>
     </message>
     <message>
         <source>Time display</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeitanzeige</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished">Nie</translation>
+        <translation>Nie</translation>
     </message>
     <message>
         <source>Start</source>
-        <translation type="unfinished">Beginn</translation>
+        <translation>Beginn</translation>
     </message>
     <message>
         <source>Start-End</source>
-        <translation type="unfinished"></translation>
+        <translation>Beginn-Ende</translation>
+    </message>
+    <message>
+        <source>Defaults</source>
+        <translation>Voreinstellung</translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation>Ort:</translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation>Büro</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation>zu Hause</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation>Kategorie:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Dieser Termin ist ganztägig.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
-        <translation type="unfinished">Woche</translation>
+        <source>w</source>
+        <translation>W</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation>J:</translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation>M:</translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation>00.Jan-00.Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
-        <translation>W: %1</translation>
+        <source>w</source>
+        <translation>W</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation>00 Jan-00 Jan</translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>M</translation>
     </message>
diff --git a/i18n/de/drawpad.ts b/i18n/de/drawpad.ts
index b91def3..11224ee 100644
--- a/i18n/de/drawpad.ts
+++ b/i18n/de/drawpad.ts
@@ -1,9 +1,10 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DrawPad</name>
     <message>
         <source>Delete All</source>
         <translation>Alles löschen</translation>
     </message>
     <message>
         <source>Import</source>
@@ -152,89 +153,89 @@ all the pages?</source>
 wirklich löschen?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Kantenglättung</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken um ein neues Blatt zu erzeugen.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um das aktuelle Blatt zu löschen.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um  das aktuelle Blatt zu entfernen.</translation>
     </message>
     <message>
         <source>Click here to undo the last action.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um die letzte Aktion zu widerrufen.</translation>
     </message>
     <message>
         <source>Click here to re-perform the last action.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um die letzte Aktion erneut auszuführen.</translation>
     </message>
     <message>
         <source>Click here to view the first page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um  die erste Seite zu sehen.</translation>
     </message>
     <message>
         <source>Click here to view the previous page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um die vorherige Seite zu sehen.</translation>
     </message>
     <message>
         <source>Click here to view the next page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken um die nächste Seite zu sehen.</translation>
     </message>
     <message>
         <source>Click here to view the last page.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um die letzte Seite zu sehen.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw lines.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um eines der verfügbaren Linienwerkzeuge zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw rectangles.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um eines der verfügbaren Rechteckwerkzeuge zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select one of the available tools to draw ellipses.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um eines der verfügbaren Ellipsenwerkzeuge zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select the text drawing tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um das Textwerkzeug zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select the fill tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um das Füllwerkzeug zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select the eraser tool.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um das Löschwerkzeug zu wählen.</translation>
     </message>
     <message>
         <source>Click here to select the width of the drawing pen.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um die Dicke des Zeichenstifts zu setzen.</translation>
     </message>
     <message>
         <source>Click here to select the color used when drawing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um die Zeichenfarbe zu wählen..</translation>
     </message>
     <message>
         <source>Click here to select the color used when filling in areas.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um die Füllfarbe zu wählen..</translation>
     </message>
     <message>
         <source>DrawPad - Page %1/%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Schmierzettel - Seite %1/%2</translation>
     </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>Seitenauswahl</translation>
     </message>
@@ -359,25 +360,25 @@ wirklich löschen?</translation>
         <source>Height:</source>
         <translation>Höhe:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Title: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Titel: %1</translation>
     </message>
     <message>
         <source>Dimension: %1x%2</source>
-        <translation type="unfinished"></translation>
+        <translation>Dimension: %1x%2</translation>
     </message>
     <message>
         <source>Date: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Datum: %1</translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
         <translation>Text eingeben</translation>
     </message>
@@ -413,28 +414,28 @@ wirklich säubern?</translation>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>Wollen Sie die Seite
 wirklich löschen?</translation>
     </message>
     <message>
         <source>Click here to add a new sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um ein neues Blatt zu erzeugen.</translation>
     </message>
     <message>
         <source>Click here to erase the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um das aktuelle Blatt zu löschen.</translation>
     </message>
     <message>
         <source>Click here to remove the current sheet.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um das aktuelle Blatt zu entfernen.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet up one position in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um das aktuelle Blatt eine Position nach oben zu verschieben.</translation>
     </message>
     <message>
         <source>Click here to move the current sheet down one position in the list.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hier klicken, um das aktuelle Blatt eine Position nach unten zu verschieben.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/launchersettings.ts b/i18n/de/launchersettings.ts
index d6ee0ff..e170eb0 100644
--- a/i18n/de/launchersettings.ts
+++ b/i18n/de/launchersettings.ts
@@ -1,208 +1,209 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Launchereinstellungen</translation>
     </message>
     <message>
         <source>Taskbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Taskbar</translation>
     </message>
     <message>
         <source>O-Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>O-Menü</translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiter</translation>
     </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
-        <translation type="unfinished"></translation>
+        <translation>Lädt Applets im O-Menü:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt Launcher-Reiter im O-Menü</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie die Applets, die Sie im O-Menü angezeigt haben möchten.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügt die Inhalte der Launcher-Reiter als Menüs in das O-Menü ein.</translation>
     </message>
 </context>
 <context>
     <name>SampleView</name>
     <message>
         <source>Sample 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Beispiel 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Beispiel 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Beispiel 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Reiter bearbeiten</translation>
     </message>
     <message>
         <source>Background</source>
-        <translation type="unfinished"></translation>
+        <translation>Hintergrund</translation>
     </message>
     <message>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Font</translation>
     </message>
     <message>
         <source>Icons</source>
-        <translation type="unfinished"></translation>
+        <translation>Symbole</translation>
     </message>
     <message>
         <source>Previewing %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorschau %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
-        <translation type="unfinished"></translation>
+        <translation>Dies ist eine grobe Vorschau wie der gewählte Reiter aussehen wird.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutzerdefinierte Schrift</translation>
     </message>
     <message>
         <source>Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>Typ:</translation>
     </message>
     <message>
         <source>Ruled</source>
-        <translation type="unfinished"></translation>
+        <translation>Ruled</translation>
     </message>
     <message>
         <source>Solid color</source>
-        <translation type="unfinished"></translation>
+        <translation>Einfarbig</translation>
     </message>
     <message>
         <source>Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Bild</translation>
     </message>
     <message>
         <source>Select...</source>
-        <translation type="unfinished"></translation>
+        <translation>Auswählen...</translation>
     </message>
     <message>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation>Voreinstellung</translation>
     </message>
     <message>
         <source>Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>Größe:</translation>
     </message>
     <message>
         <source>Small</source>
-        <translation type="unfinished"></translation>
+        <translation>Klein</translation>
     </message>
     <message>
         <source>Large</source>
-        <translation type="unfinished"></translation>
+        <translation>Groß</translation>
     </message>
     <message>
         <source>Color:</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe: </translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
-        <translation type="unfinished"></translation>
+        <translation>Launcher-Reiter: </translation>
     </message>
     <message>
         <source>foobar</source>
-        <translation type="unfinished"></translation>
+        <translation>Werkzeugleiste</translation>
     </message>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished"></translation>
+        <translation>LÖschen</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
-        <translation type="unfinished"></translation>
+        <translation>Großen &quot;Busy Indicator&quot; aktivieren</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation type="unfinished"></translation>
+        <translation>Blinkenden &quot;Busy-Indicator&quot; aktivieren</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie den Reiter den Sie bearbeiten oder Löschen möchten.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
-        <translation type="unfinished"></translation>
+        <translation>Fügt einen neuen Reiter in den Launcher ein.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffnet einen neuen Dialog um den gewählten Reiter zu bearbeiten.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
-        <translation type="unfinished"></translation>
+        <translation>Löscht einen Reiter aus dem Launcher.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivieren Sie dieses wenn Sie eine große Tätigkeitsanzeige in Bildschirmmitte möchten anstatt der in der Taskbar.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="unfinished"></translation>
+        <translation>Aktivieren Sie dieses wenn Sie eine große Tätigkeitsanzeige in der Taskbar möchten.</translation>
     </message>
     <message>
         <source>All Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>All Reiter</translation>
     </message>
     <message>
         <source>Documents</source>
-        <translation type="unfinished"></translation>
+        <translation>Dokumente</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
-        <translation type="unfinished"></translation>
+        <translation>Noch nicht implementiert</translation>
     </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
-        <translation type="unfinished"></translation>
+        <translation>Applets in die Taskbar laden:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
-        <translation type="unfinished"></translation>
+        <translation>Wählen Sie die Applets, die Sie in der Taskbar angezeigt haben möchten.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libbatteryapplet.ts b/i18n/de/libbatteryapplet.ts
index a347e60..b1b6d64 100644
--- a/i18n/de/libbatteryapplet.ts
+++ b/i18n/de/libbatteryapplet.ts
@@ -75,12 +75,12 @@
         <translation>Keine Zusatzbatterie angeschlossen</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
     <message>
         <source>Battery status</source>
-        <translation type="unfinished"></translation>
+        <translation>Batteriestatus</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libflat.ts b/i18n/de/libflat.ts
index 8406d92..0641f9c 100644
--- a/i18n/de/libflat.ts
+++ b/i18n/de/libflat.ts
@@ -1,9 +1,10 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Decoration</name>
     <message>
         <source>Flat</source>
-        <translation type="unfinished"></translation>
+        <translation>Flach</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libinterfaces.ts b/i18n/de/libinterfaces.ts
index 407ea1f..3234ce4 100644
--- a/i18n/de/libinterfaces.ts
+++ b/i18n/de/libinterfaces.ts
@@ -1,154 +1,155 @@
 <!DOCTYPE TS><TS>
+<defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Erweiterte Information</translation>
     </message>
     <message>
         <source>eth0</source>
-        <translation type="unfinished"></translation>
+        <translation>eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>IP Addresse</translation>
     </message>
     <message>
         <source>Interface</source>
-        <translation type="unfinished"></translation>
+        <translation>Interface</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Subnetzmaske</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
+        <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>DHCP Information</source>
-        <translation type="unfinished"></translation>
+        <translation>DHCP Information</translation>
     </message>
     <message>
         <source>DHCP Server</source>
-        <translation type="unfinished"></translation>
+        <translation>DHCP Server</translation>
     </message>
     <message>
         <source>Lease Expires</source>
-        <translation type="unfinished"></translation>
+        <translation>Lease Expires</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
-        <translation type="unfinished"></translation>
+        <translation>Lease Obtained</translation>
     </message>
     <message>
         <source>Broadcast</source>
-        <translation type="unfinished"></translation>
+        <translation>Broadcast</translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation type="unfinished"></translation>
+        <translation>MAC-Addresse</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00:00:00:00</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Interface-Information</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Refreshen</translation>
     </message>
     <message>
         <source>S&amp;top</source>
-        <translation type="unfinished"></translation>
+        <translation>S&amp;top</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
-        <translation type="unfinished"></translation>
+        <translation>Neu&amp;estart</translation>
     </message>
     <message>
         <source>&amp;Start</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Start</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>IP Addresse</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Subnetz-Maske</translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation type="unfinished"></translation>
+        <translation>MAC Addresse</translation>
     </message>
     <message>
         <source>Broadcast</source>
-        <translation type="unfinished"></translation>
+        <translation>Broadcast</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation type="unfinished"></translation>
+        <translation>0.0.0.0</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation type="unfinished"></translation>
+        <translation>00:00:00:00:00:0</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
-        <translation type="unfinished"></translation>
+        <translation>An&amp;zeige erweiterter Informationen</translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Interface-Konfiguration</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisch starten</translation>
     </message>
     <message>
         <source>DHCP</source>
-        <translation type="unfinished"></translation>
+        <translation>DHCP</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation>Statische IP-Adressen</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation type="unfinished"></translation>
+        <translation>Subnetz-Maske</translation>
     </message>
     <message>
         <source>First DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Erster DNS</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation type="unfinished"></translation>
+        <translation>IP Addresse</translation>
     </message>
     <message>
         <source>Gateway</source>
-        <translation type="unfinished"></translation>
+        <translation>Gateway</translation>
     </message>
     <message>
         <source>Second DNS</source>
-        <translation type="unfinished"></translation>
+        <translation>Zweiter DNS</translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
-        <translation type="unfinished"></translation>
+        <translation> Interface-Neustart</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/mailit.ts b/i18n/de/mailit.ts
index 17c802b..788f406 100644
--- a/i18n/de/mailit.ts
+++ b/i18n/de/mailit.ts
@@ -180,17 +180,17 @@ der Mail gefunden werden mit dem Betreff: </translation>
     </message>
     <message>
         <source>
 Mail has NOT been sent</source>
         <translation>Die Mail wurde *nicht* gesendet</translation>
     </message>
     <message>
         <source>Attachment error</source>
-        <translation>Attachementfehler</translation>
+        <translation>Attachmentfehler</translation>
     </message>
     <message>
         <source>OK
 </source>
         <translation>OK
 </translation>
     </message>
 </context>
diff --git a/i18n/en/datebook.ts b/i18n/en/datebook.ts
index 2fc3843..1b02a97 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -213,16 +205,20 @@ Quit anyway?</source>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -308,67 +304,75 @@ Quit anyway?</source>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 9cf0610..e3428b6 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Vista</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Configurar</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
@@ -217,16 +209,20 @@ Libere espacio y vuelva a intentarlo.
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished">Calendario</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
@@ -312,67 +308,75 @@ Libere espacio y vuelva a intentarlo.
     <message>
         <source>Start</source>
         <translation type="unfinished">Inicio</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished">Oficina</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">Casa</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Esta cita dura todo el día.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
-        <translation type="unfinished">semana</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation>A: </translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation>S: </translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Ene-00. Ene</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
-        <translation>S: %1</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation>00 Ene-00 Ene</translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>L</translation>
     </message>
diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index f36189a..5d82cfe 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -2,24 +2,16 @@
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Calendrier</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Vue</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Options</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
@@ -219,16 +211,20 @@ Quitter ?</translation>
     <message>
         <source>AM</source>
         <translation>Matin</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished">Calendrier</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Préférences</translation>
     </message>
     <message>
@@ -314,67 +310,75 @@ Quitter ?</translation>
     <message>
         <source>Start</source>
         <translation type="unfinished">Début</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished">Bureau</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">Maison</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>C&apos;est un événement qui dure toute la journée.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
-        <translation type="unfinished">semaine</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation>An :</translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation>Sem :</translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
-        <translation>Sem:%1</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>Sem: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation>00 Jan-00 Jan</translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>L</translation>
     </message>
diff --git a/i18n/hu/datebook.ts b/i18n/hu/datebook.ts
index 153c22f..2e2ba64 100644
--- a/i18n/hu/datebook.ts
+++ b/i18n/hu/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Naptár</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Nézet</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Beállítások</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Ma</translation>
     </message>
     <message>
@@ -218,16 +210,20 @@ Mégis kilép?</translation>
     <message>
         <source>AM</source>
         <translation>De</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished">Naptár</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Beállítások</translation>
     </message>
     <message>
@@ -313,67 +309,75 @@ Mégis kilép?</translation>
     <message>
         <source>Start</source>
         <translation type="unfinished">Kezdet</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished">Iroda</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">Otthon</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ez egy egész napos esemény.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
-        <translation type="unfinished">hét</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation>É:</translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation>H:</translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation>Jan 00.-Jan 00.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
-        <translation>H: %1</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>H: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation>Jan 00-Jan 00</translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>H</translation>
     </message>
diff --git a/i18n/it/datebook.ts b/i18n/it/datebook.ts
index b121546..b3f9ce0 100644
--- a/i18n/it/datebook.ts
+++ b/i18n/it/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Vista</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Impostazioni</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
@@ -218,16 +210,20 @@ Uscire comunque?</translation>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished">Agenda</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
@@ -313,67 +309,75 @@ Uscire comunque?</translation>
     <message>
         <source>Start</source>
         <translation type="unfinished">Inizio</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished">Ufficio</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">Abitazione</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Questo è un evento per tutto il giorno.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
-        <translation type="unfinished">settimana</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation>A: </translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation>S: </translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Gen-00. Gen</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
-        <translation>W: %1</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation>00 Gen-00 Gen</translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>L</translation>
     </message>
diff --git a/i18n/ja/datebook.ts b/i18n/ja/datebook.ts
index 5600405..7cc5f42 100644
--- a/i18n/ja/datebook.ts
+++ b/i18n/ja/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -213,16 +205,20 @@ Quit anyway?</source>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -308,67 +304,75 @@ Quit anyway?</source>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/ko/datebook.ts b/i18n/ko/datebook.ts
index 5600405..7cc5f42 100644
--- a/i18n/ko/datebook.ts
+++ b/i18n/ko/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -213,16 +205,20 @@ Quit anyway?</source>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -308,67 +304,75 @@ Quit anyway?</source>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/nl/datebook.ts b/i18n/nl/datebook.ts
index 30a42cf..96030eb 100644
--- a/i18n/nl/datebook.ts
+++ b/i18n/nl/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Aanzicht</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Vandaag</translation>
     </message>
     <message>
@@ -218,16 +210,20 @@ Toch afsluiten?</translation>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished">Kalender</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Voorkeuren</translation>
     </message>
     <message>
@@ -313,67 +309,75 @@ Toch afsluiten?</translation>
     <message>
         <source>Start Time:</source>
         <translation>Aanvangstijd:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished">Kantoor</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">Thuis</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Deze afspraak duurt de hele dag.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
-        <translation>week</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation>J:</translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation>W:</translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
-        <translation>W: %1</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation>00 Jan-00 Jan</translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>M
 
diff --git a/i18n/no/datebook.ts b/i18n/no/datebook.ts
index 5600405..7cc5f42 100644
--- a/i18n/no/datebook.ts
+++ b/i18n/no/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -213,16 +205,20 @@ Quit anyway?</source>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -308,67 +304,75 @@ Quit anyway?</source>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pl/datebook.ts b/i18n/pl/datebook.ts
index 3f34bc2..71b9162 100644
--- a/i18n/pl/datebook.ts
+++ b/i18n/pl/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendarz</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Widok</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Dzis</translation>
     </message>
     <message>
@@ -218,16 +210,20 @@ Wyjsc ?</translation>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished">Kalendarz</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
@@ -313,67 +309,75 @@ Wyjsc ?</translation>
     <message>
         <source>Start</source>
         <translation type="unfinished">Poczatek</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished">Biuro</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">Dom</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
-        <translation type="unfinished">tydzien</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pt/datebook.ts b/i18n/pt/datebook.ts
index 1e3e275..14fc080 100644
--- a/i18n/pt/datebook.ts
+++ b/i18n/pt/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -213,16 +205,20 @@ Quit anyway?</source>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -308,67 +304,75 @@ Quit anyway?</source>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/pt_BR/datebook.ts b/i18n/pt_BR/datebook.ts
index cf777b4..09f751b 100644
--- a/i18n/pt_BR/datebook.ts
+++ b/i18n/pt_BR/datebook.ts
@@ -14,20 +14,16 @@
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Ver</translation>
-    </message>
-    <message>
         <source>Week</source>
         <translation>Semana</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mês</translation>
     </message>
     <message>
@@ -80,20 +76,16 @@ longa que o intervalo entre repetições.</translation>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossível editar dados durante sincronização</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Configurações</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>ListaSem</translation>
     </message>
     <message>
@@ -219,16 +211,20 @@ longa que o intervalo entre repetições.</translation>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished">Calendário</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished">Alarme Padrão</translation>
     </message>
     <message>
@@ -314,67 +310,75 @@ longa que o intervalo entre repetições.</translation>
     <message>
         <source>Start</source>
         <translation type="unfinished">Início</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
-        <translation type="unfinished">semana</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>W: </source>
-        <translation type="unfinished">S: </translation>
-    </message>
-    <message>
-        <source>Y: </source>
-        <translation type="unfinished">A: </translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>S</translation>
     </message>
diff --git a/i18n/sl/datebook.ts b/i18n/sl/datebook.ts
index 51fb5e0..40997e7 100644
--- a/i18n/sl/datebook.ts
+++ b/i18n/sl/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>Pogled</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Nastavitve</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
     <message>
@@ -219,16 +211,20 @@ Izhod?</translation>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished">Koledar</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Možnosti</translation>
     </message>
     <message>
@@ -314,67 +310,75 @@ Izhod?</translation>
     <message>
         <source>Start</source>
         <translation type="unfinished">Začetek</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished">Pisarna</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">Dom</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>To je celodnevni dogodek.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
-        <translation type="unfinished">teden</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation>L: </translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation>T: </translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>T: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation>00 Jan-00 Jan</translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>P</translation>
     </message>
diff --git a/i18n/xx/datebook.ts b/i18n/xx/datebook.ts
index e1376dd..6ec4651 100644
--- a/i18n/xx/datebook.ts
+++ b/i18n/xx/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>View</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>FOO</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -213,16 +205,20 @@ Quit anyway?</source>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -308,67 +304,75 @@ Quit anyway?</source>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
-        <translation>FOO</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation>FOO</translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
-        <translation>FOO</translation>
+        <source>w</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation>FOO</translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation>FOO</translation>
     </message>
diff --git a/i18n/zh_CN/datebook.ts b/i18n/zh_CN/datebook.ts
index 5600405..7cc5f42 100644
--- a/i18n/zh_CN/datebook.ts
+++ b/i18n/zh_CN/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -213,16 +205,20 @@ Quit anyway?</source>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -308,67 +304,75 @@ Quit anyway?</source>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index 2fc3843..1b02a97 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -1,24 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBook</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -213,16 +205,20 @@ Quit anyway?</source>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -308,67 +304,75 @@ Quit anyway?</source>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Location:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
-        <source>week</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
-        <source>Y: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>W: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
-        <source>W: %1</source>
+        <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>00 Jan-00 Jan</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>