I added some tr() so the i18n-files need to be updated.

plus: some german updates

67 files changed, 922 insertions, 94 deletions

diff --git a/i18n/de/datebook.ts b/i18n/de/datebook.ts
index b8b78f2..f2abcbb 100644
--- a/i18n/de/datebook.ts
+++ b/i18n/de/datebook.ts
@@ -1,701 +1,701 @@
 <!DOCTYPE TS><TS>
 <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>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>7 Tage</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation>Alarm- und Startzeit...</translation>
     </message>
     <message>
         <source>Default View</source>
         <translation>Voreinstellung</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kann Daten zur Zeit nicht editieren, synchronisiere gerade</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Ereignis editieren</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>Minuten)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Kein Speicherplatz</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Kalender war nicht in der Lage,
 Ihre Änderungen zu speichern.
 Bitte machen Sie etwas Speicherplatz
 frei.
 Trozdem beenden?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Fehler!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>D</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished">Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished">Ende</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished">Minuten</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <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>M</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation>D</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation>D</translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation>S</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation>S</translation>
     </message>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Wiederholung...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Täglich...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Wöchentlich...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Monatlich...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Jählich...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Keine Wiederholung...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Neues Ereignis</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Treffen</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Mittagessen</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reise</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Beschreibung</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>zu Hause</translation>
     </message>
     <message>
         <source>Start - End</source>
         <translation>Start - Ende</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Ganztägig</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zeitzone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Still</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Laut</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Wiederholung</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Keine Wiederholung...</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Ende</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>Jahr(e)</translation>
     </message>
     <message>
         <source>days</source>
         <translation>Tage</translation>
     </message>
     <message>
         <source>day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>Wochen</translation>
     </message>
     <message>
         <source>week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source> and </source>
         <translation>und</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 und</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>,
 und</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Zu wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Woche</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Häufigkeit</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Endet am:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Kein Enddatum</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Mo</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Mi</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Do</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Fr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sa</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>So</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/kcheckers.ts b/i18n/de/kcheckers.ts
index 7819b7d..02e153d 100644
--- a/i18n/de/kcheckers.ts
+++ b/i18n/de/kcheckers.ts
@@ -1,101 +1,101 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>KCheckers</name>
     <message>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>Neu</translation>
     </message>
     <message>
         <source>Quit</source>
-        <translation type="unfinished"></translation>
+        <translation>Beenden</translation>
     </message>
     <message>
         <source>Beginner</source>
-        <translation type="unfinished"></translation>
+        <translation>Anfänger</translation>
     </message>
     <message>
         <source>Novice</source>
-        <translation type="unfinished"></translation>
+        <translation>Neuling</translation>
     </message>
     <message>
         <source>Average</source>
-        <translation type="unfinished"></translation>
+        <translation>Durchschnittlich</translation>
     </message>
     <message>
         <source>Good</source>
-        <translation type="unfinished"></translation>
+        <translation>Gut</translation>
     </message>
     <message>
         <source>Expert</source>
-        <translation type="unfinished"></translation>
+        <translation>Experte</translation>
     </message>
     <message>
         <source>Master</source>
-        <translation type="unfinished"></translation>
+        <translation>Meister</translation>
     </message>
     <message>
         <source>English Rules</source>
-        <translation type="unfinished"></translation>
+        <translation>Englische Regeln</translation>
     </message>
     <message>
         <source>Russian Rules</source>
-        <translation type="unfinished"></translation>
+        <translation>Russische Regeln</translation>
     </message>
     <message>
         <source>Marble Board</source>
-        <translation type="unfinished"></translation>
+        <translation>Marmorbrett</translation>
     </message>
     <message>
         <source>Wooden Board</source>
-        <translation type="unfinished"></translation>
+        <translation>Holzbrett</translation>
     </message>
     <message>
         <source>What&apos;s This</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About KCheckers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About &amp;Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skill</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Optionen</translation>
     </message>
     <message>
         <source>Help</source>
-        <translation type="unfinished"></translation>
+        <translation>Hilfe</translation>
     </message>
     <message>
         <source>Go!</source>
-        <translation type="unfinished"></translation>
+        <translation>Los!</translation>
     </message>
     <message>
         <source>Congratulation! You have won!</source>
-        <translation type="unfinished"></translation>
+        <translation>Glückwunsch! Sie haben gewonnen!</translation>
     </message>
     <message>
         <source>Please wait...</source>
-        <translation type="unfinished"></translation>
+        <translation>Bitte Warten...</translation>
     </message>
     <message>
         <source>You have lost. Game over.</source>
-        <translation type="unfinished"></translation>
+        <translation>Sie haben verloren...</translation>
     </message>
     <message>
         <source>Incorrect course.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/addressbook.ts b/i18n/en/addressbook.ts
index af328c5..8bfb2bc 100644
--- a/i18n/en/addressbook.ts
+++ b/i18n/en/addressbook.ts
@@ -1,1213 +1,1225 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyztan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/clock.ts b/i18n/en/clock.ts
index eee6707..6426063 100644
--- a/i18n/en/clock.ts
+++ b/i18n/en/clock.ts
@@ -1,73 +1,81 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm On</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alarm Off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/datebook.ts b/i18n/en/datebook.ts
index 6d6005d..7e9de86 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -1,695 +1,695 @@
 <!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>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <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>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</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>Start - End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/tictac.ts b/i18n/en/tictac.ts
index 4eb9e18..ab9ecd2 100644
--- a/i18n/en/tictac.ts
+++ b/i18n/en/tictac.ts
@@ -1,2 +1,21 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/today.ts b/i18n/en/today.ts
index 67bf2c3..2308942 100644
--- a/i18n/en/today.ts
+++ b/i18n/en/today.ts
@@ -1,103 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>How many 
+appointment
+should
+be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Should today be
+autostarted on
+resume? (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/todolist.ts b/i18n/en/todolist.ts
index d7b7da7..b255358 100644
--- a/i18n/en/todolist.ts
+++ b/i18n/en/todolist.ts
@@ -1,157 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index af328c5..8bfb2bc 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -1,1213 +1,1225 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyztan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/clock.ts b/i18n/fr/clock.ts
index eee6707..6426063 100644
--- a/i18n/fr/clock.ts
+++ b/i18n/fr/clock.ts
@@ -1,73 +1,81 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm On</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alarm Off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index 6d6005d..7e9de86 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -1,695 +1,695 @@
 <!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>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <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>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</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>Start - End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/tictac.ts b/i18n/fr/tictac.ts
index 4eb9e18..ab9ecd2 100644
--- a/i18n/fr/tictac.ts
+++ b/i18n/fr/tictac.ts
@@ -1,2 +1,21 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index 67bf2c3..2308942 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -1,103 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>How many 
+appointment
+should
+be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Should today be
+autostarted on
+resume? (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index d7b7da7..b255358 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -1,157 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/addressbook.ts b/i18n/hu/addressbook.ts
index af328c5..8bfb2bc 100644
--- a/i18n/hu/addressbook.ts
+++ b/i18n/hu/addressbook.ts
@@ -1,1213 +1,1225 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyztan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/clock.ts b/i18n/hu/clock.ts
index eee6707..6426063 100644
--- a/i18n/hu/clock.ts
+++ b/i18n/hu/clock.ts
@@ -1,73 +1,81 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm On</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alarm Off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/datebook.ts b/i18n/hu/datebook.ts
index 6d6005d..7e9de86 100644
--- a/i18n/hu/datebook.ts
+++ b/i18n/hu/datebook.ts
@@ -1,695 +1,695 @@
 <!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>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <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>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</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>Start - End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/tictac.ts b/i18n/hu/tictac.ts
index 4eb9e18..ab9ecd2 100644
--- a/i18n/hu/tictac.ts
+++ b/i18n/hu/tictac.ts
@@ -1,2 +1,21 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/today.ts b/i18n/hu/today.ts
index 67bf2c3..2308942 100644
--- a/i18n/hu/today.ts
+++ b/i18n/hu/today.ts
@@ -1,103 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>How many 
+appointment
+should
+be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Should today be
+autostarted on
+resume? (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/todolist.ts b/i18n/hu/todolist.ts
index d7b7da7..b255358 100644
--- a/i18n/hu/todolist.ts
+++ b/i18n/hu/todolist.ts
@@ -1,157 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/addressbook.ts b/i18n/ja/addressbook.ts
index af328c5..8bfb2bc 100644
--- a/i18n/ja/addressbook.ts
+++ b/i18n/ja/addressbook.ts
@@ -1,1213 +1,1225 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyztan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/clock.ts b/i18n/ja/clock.ts
index eee6707..6426063 100644
--- a/i18n/ja/clock.ts
+++ b/i18n/ja/clock.ts
@@ -1,73 +1,81 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm On</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alarm Off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/datebook.ts b/i18n/ja/datebook.ts
index 6d6005d..7e9de86 100644
--- a/i18n/ja/datebook.ts
+++ b/i18n/ja/datebook.ts
@@ -1,695 +1,695 @@
 <!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>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <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>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</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>Start - End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ja/tictac.ts b/i18n/ja/tictac.ts
index 4eb9e18..ab9ecd2 100644
--- a/i18n/ja/tictac.ts
+++ b/i18n/ja/tictac.ts
@@ -1,2 +1,21 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ja/today.ts b/i18n/ja/today.ts
index 67bf2c3..2308942 100644
--- a/i18n/ja/today.ts
+++ b/i18n/ja/today.ts
@@ -1,103 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>How many 
+appointment
+should
+be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Should today be
+autostarted on
+resume? (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/todolist.ts b/i18n/ja/todolist.ts
index d7b7da7..b255358 100644
--- a/i18n/ja/todolist.ts
+++ b/i18n/ja/todolist.ts
@@ -1,157 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/addressbook.ts b/i18n/ko/addressbook.ts
index af328c5..8bfb2bc 100644
--- a/i18n/ko/addressbook.ts
+++ b/i18n/ko/addressbook.ts
@@ -1,1213 +1,1225 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyztan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/clock.ts b/i18n/ko/clock.ts
index eee6707..6426063 100644
--- a/i18n/ko/clock.ts
+++ b/i18n/ko/clock.ts
@@ -1,73 +1,81 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm On</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alarm Off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/datebook.ts b/i18n/ko/datebook.ts
index 6d6005d..7e9de86 100644
--- a/i18n/ko/datebook.ts
+++ b/i18n/ko/datebook.ts
@@ -1,695 +1,695 @@
 <!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>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <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>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</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>Start - End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ko/tictac.ts b/i18n/ko/tictac.ts
index 4eb9e18..ab9ecd2 100644
--- a/i18n/ko/tictac.ts
+++ b/i18n/ko/tictac.ts
@@ -1,2 +1,21 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/ko/today.ts b/i18n/ko/today.ts
index 67bf2c3..2308942 100644
--- a/i18n/ko/today.ts
+++ b/i18n/ko/today.ts
@@ -1,103 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>How many 
+appointment
+should
+be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Should today be
+autostarted on
+resume? (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/todolist.ts b/i18n/ko/todolist.ts
index d7b7da7..b255358 100644
--- a/i18n/ko/todolist.ts
+++ b/i18n/ko/todolist.ts
@@ -1,157 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/addressbook.ts b/i18n/no/addressbook.ts
index af328c5..8bfb2bc 100644
--- a/i18n/no/addressbook.ts
+++ b/i18n/no/addressbook.ts
@@ -1,1213 +1,1225 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyztan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/clock.ts b/i18n/no/clock.ts
index eee6707..6426063 100644
--- a/i18n/no/clock.ts
+++ b/i18n/no/clock.ts
@@ -1,73 +1,81 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm On</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alarm Off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/datebook.ts b/i18n/no/datebook.ts
index 6d6005d..7e9de86 100644
--- a/i18n/no/datebook.ts
+++ b/i18n/no/datebook.ts
@@ -1,695 +1,695 @@
 <!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>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <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>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</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>Start - End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/tictac.ts b/i18n/no/tictac.ts
index 4eb9e18..ab9ecd2 100644
--- a/i18n/no/tictac.ts
+++ b/i18n/no/tictac.ts
@@ -1,2 +1,21 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/today.ts b/i18n/no/today.ts
index 67bf2c3..2308942 100644
--- a/i18n/no/today.ts
+++ b/i18n/no/today.ts
@@ -1,103 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>How many 
+appointment
+should
+be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Should today be
+autostarted on
+resume? (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/todolist.ts b/i18n/no/todolist.ts
index d7b7da7..b255358 100644
--- a/i18n/no/todolist.ts
+++ b/i18n/no/todolist.ts
@@ -1,157 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/addressbook.ts b/i18n/pl/addressbook.ts
index 9aada62..2f106b8 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -1,1213 +1,1225 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyztan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/datebook.ts b/i18n/pl/datebook.ts
index 6d6005d..7e9de86 100644
--- a/i18n/pl/datebook.ts
+++ b/i18n/pl/datebook.ts
@@ -1,695 +1,695 @@
 <!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>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <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>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</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>Start - End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/tictac.ts b/i18n/pl/tictac.ts
index 4eb9e18..ab9ecd2 100644
--- a/i18n/pl/tictac.ts
+++ b/i18n/pl/tictac.ts
@@ -1,2 +1,21 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/today.ts b/i18n/pl/today.ts
index f3f592d..aa1e1f2 100644
--- a/i18n/pl/today.ts
+++ b/i18n/pl/today.ts
@@ -1,103 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>How many 
+appointment
+should
+be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Should today be
+autostarted on
+resume? (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index d7b7da7..b255358 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -1,157 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index 06e512b..c9ff7c9 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -1,1268 +1,1280 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AbEditor</name>
     <message>
         <source>Male</source>
         <translation type="obsolete">Masculino</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Notas</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Nome do Meio</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Feminino</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Sexo</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="obsolete">Contatos</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="obsolete">Notas...</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Sobrenome</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="obsolete">Categorias</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="obsolete">Escrever Nota</translation>
     </message>
 </context>
 <context>
     <name>AbTable</name>
     <message>
         <source>Pick</source>
         <translation>Escolha</translation>
     </message>
     <message>
         <source>Full Name</source>
         <translation>Nome Completo</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contato</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Primeiro Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Sobrenome</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-mail Padrão</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Arquivar Como</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Up</source>
         <translation type="unfinished">P/ Cima</translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished">P/ Baixo</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished">Organizar Campos de Edição</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished">Selecione a ordem dos campos:</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Mb</source>
         <translation>Mb</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edit</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Trabalho</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Editar Endereço</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation>Não há espaço suficiente para criar
 os arquivos iniciais necessários.
 Libere algum espaço antes de
 inserir dados!</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossível salvar informação.
 Libere algum espaço e
 tente novamente.
 
 Sair assim mesmo?</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Sexo</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatos</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Título</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Sobrenome</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Contato</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Organizar Campos de Edição</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não Preenchido</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>E-mail Padrão</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Arquivar Como</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Out of Space</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Escrever E-mail Para</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Enviar Registro</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contatos - Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished">E-mail Padrão</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished">Título</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished">Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished">Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished">Arquivar Como</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished">Sexo</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished">Notas</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished">Notas...</translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished">Masculino</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished">Feminino</translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished">Escrever Nota</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished">Contatos</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyztan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/clock.ts b/i18n/pt_BR/clock.ts
index 0cc1639..130593c 100644
--- a/i18n/pt_BR/clock.ts
+++ b/i18n/pt_BR/clock.ts
@@ -1,74 +1,82 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Clock</name>
     <message>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Relógio</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Zerar</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Iniciar</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Cronômetro</translation>
     </message>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm On</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alarm Off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/datebook.ts b/i18n/pt_BR/datebook.ts
index 8ec3057..c8e1ce1 100644
--- a/i18n/pt_BR/datebook.ts
+++ b/i18n/pt_BR/datebook.ts
@@ -1,726 +1,726 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DateBook</name>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <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>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation> minutos)</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Calendário nao pode salvar
 suas modificações.
 Libere algum espaço e tente novamente.
 
 Sair assim mesmo?</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Erro!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Conserte</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Desconhecido)</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>A duração do evento é potencialmente mais
 longa que o intervalo entre repetições.</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Edit Event</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Continuar</translation>
     </message>
     <message>
         <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>Alarm and Start Time...</source>
         <translation>Alarme e Horário de Inicio...</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>ListaSem</translation>
     </message>
     <message>
         <source>Default View</source>
         <translation>Visualiz. Padrão</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>F</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished">S</translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished">Q</translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished">Q</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished">Alarme Padrão</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished">Horário de início dos eventos</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"> minutos</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished">Horário de Inicio:</translation>
     </message>
     <message>
         <source>Preferences</source>
         <translation type="unfinished">Preferências</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished">Configuração do Alarme</translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished">:00</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>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <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>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation>Q</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation>Q</translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation>S</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation>S</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation>D</translation>
     </message>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>No Repeat...</source>
         <translation>Sem Repetição...</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetir...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Diariamente...</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Anualmente...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mensalmente...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Semanalmente...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>End</source>
         <translation type="obsolete">Fim</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished">Casa</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished">Alto</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished">Almoço</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="obsolete">Início</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished">&amp;Alarme</translation>
     </message>
     <message>
         <source>(None)</source>
         <translation type="obsolete">(Nenhum)</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished">Reunião</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished">Sem Repetição...</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"> minutos</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished">Jantar</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Descrição:</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="obsolete">(Desconhecido)</translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished">Escritório</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished">Repetir</translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished">Local</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished">Silencioso</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished">Viagem</translation>
     </message>
     <message>
         <source>Time zone:</source>
         <translation type="obsolete">Zona Horária:</translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished">O Dia Todo</translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished">Categoria</translation>
     </message>
     <message>
         <source>New Event</source>
         <translation>Novo Evento</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Every</source>
         <translation>Todo(a)</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 todo(a) </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Todo(a) </translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>O(A) %1 a cada </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>O(A) %1 %1 a cada</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>nd</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>st</source>
         <translation>o(a)</translation>
     </message>
     <message>
         <source>th</source>
         <translation>o(a)</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
         <source>week</source>
         <translation>semana</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source> and </source>
         <translation> e </translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>semanas</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 e </translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, e </translation>
     </message>
     <message>
         <source>No Repeat</source>
         <translation>Sem Repetição</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mês(es)</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dia(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir Por</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ano(s)</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Seg</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Qui</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Ter</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Qua</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished">Semana</translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished">Ano</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todo(a)</translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished">Mês</translation>
     </message>
     <message>
         <source>years</source>
         <translation>anos</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Sem Data Final</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished">Todo(a):</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Repetir Em</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meses</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished">Fim Em:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished">Freqüência</translation>
     </message>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento Repetitivo </translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/tictac.ts b/i18n/pt_BR/tictac.ts
index a5e2858..01ad06e 100644
--- a/i18n/pt_BR/tictac.ts
+++ b/i18n/pt_BR/tictac.ts
@@ -1,3 +1,22 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/today.ts b/i18n/pt_BR/today.ts
index 896e2d2..07ae202 100644
--- a/i18n/pt_BR/today.ts
+++ b/i18n/pt_BR/today.ts
@@ -1,124 +1,145 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; nova(s) mensagem(ns), &lt;b&gt;%2&lt;/b&gt; saída</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; 1&lt;/b&gt; tarefas ativas:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Existem &lt;b&gt; %1&lt;/b&gt; tarefas ativas: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Nenhuma tarefa ativa</translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished">Nenhum compromisso hoje</translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>Opiemail não instalado</translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="obsolete">Nenhum compromisso hoje</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>All</source>
         <translation type="obsolete">Tudo</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>Quantas
 tarefas devem 
 ser mostradas ?</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
-        <translation>Quantos 
+        <translation type="obsolete">Quantos 
 compromissos
 devem ser 
 mostrados ?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation>Tarefas</translation>
     </message>
     <message>
         <source>Today config</source>
         <translation>Configuração do Hoje</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation>As notas devem 
 ser mostradas ?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation>Mostrar apenas
 compr. atrasados</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation>A localização 
 deve ser 
 mostrada ?</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation>Truncar após
 quantas letras</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
-        <translation>Hoje deve abrir
+        <translation type="obsolete">Hoje deve abrir
 automaticamente ao
 ligar ? (apenas Opie)</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Misc</translation>
     </message>
+    <message>
+        <source>How many 
+appointment
+should
+be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Should today be
+autostarted on
+resume? (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index 66938ab..9b04e5b 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -1,169 +1,185 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation>Lista de Tarefas</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>D&amp;ue</source>
         <translation type="unfinished">&amp;Prazo</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished">Prioridade:</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished">2 - Alta</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="unfinished">&amp;Completada</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished">3 - Normal</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished">4 - Baixa</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished">1 - Muito Alta</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished">Categoria:</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished">Nova Tarefa</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished">5 - Muito Baixa</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todas</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation>Prior.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não preenchida</translation>
     </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>All</source>
         <translation type="obsolete">Todas</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
     <message>
         <source>Task</source>
-        <translation>Tarefa</translation>
+        <translation type="obsolete">Tarefa</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Tarefas</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarefa</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation>Impossível criar arquivos iniciais
 Libere algum espaço
 antes de inserir dados</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation>Tarefas completadas</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Tarefas não pode
 salvar suas mudanças.
 Libere algum espaço
 e tente novamente.
 
 Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não preenchido</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation>Nova Tarefa</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/addressbook.ts b/i18n/sl/addressbook.ts
index f9ddded..bc6b913 100644
--- a/i18n/sl/addressbook.ts
+++ b/i18n/sl/addressbook.ts
@@ -1,1268 +1,1280 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbEditor</name>
     <message>
         <source>First Name</source>
         <translation type="obsolete">Ime</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="obsolete">Priimek</translation>
     </message>
     <message>
         <source>Categories</source>
         <translation type="obsolete">Kategorija</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="obsolete">Spol</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="obsolete">Zapiski</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="obsolete">Medimek</translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="obsolete">Moški</translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="obsolete">Ženski</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="obsolete">Vpišite zapiske</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="obsolete">Zapiski...</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="obsolete">Stiki</translation>
     </message>
 </context>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation>Polno ime</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Stik</translation>
     </message>
     <message>
         <source>Pick</source>
         <translation>Izberi</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjen</translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation>Naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Privzeta Epošta</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Uredi polja</translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation>Izberi zaporedje polj:</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Gor</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Dol</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
         <source>Contact</source>
         <translation>Stik</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation>Napiši sporočilo</translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation>Prežarčen vnos</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation>Uredi polja</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation>Ni dovolj prostora za potrebne
 zagonske datoteke.
 
 Sprostite nekaj prostora preden
 vnesete podatke!</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Uredi moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation>Uredi naslov</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Stiki - Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Ne morem shraniti informacije.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Naziv</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Work</source>
         <translation>Delo</translation>
     </message>
     <message>
         <source>Mb</source>
         <translation>Mobitel</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Privzeta Epošta</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation>Faks</translation>
     </message>
     <message>
         <source>Phone</source>
         <translation>Telefon</translation>
     </message>
     <message>
         <source>IM</source>
         <translation></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation>Mobitel</translation>
     </message>
     <message>
         <source>Page</source>
         <translation>Stran</translation>
     </message>
     <message>
         <source>Pager</source>
         <translation>Pager</translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation>Privzeta Epošta</translation>
     </message>
     <message>
         <source>Emails</source>
         <translation>Esporočila</translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation>Naziv</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation>Pripona</translation>
     </message>
     <message>
         <source>File As</source>
         <translation>Datoteka kot</translation>
     </message>
     <message>
         <source>Gender</source>
         <translation>Spol</translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation>Delovno mesto</translation>
     </message>
     <message>
         <source>Company</source>
         <translation>Podjetje</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Zapiski</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Skupine</translation>
     </message>
     <message>
         <source>Street</source>
         <translation>Ulica</translation>
     </message>
     <message>
         <source>Street 2</source>
         <translation>Ulica 2</translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation>Poštna številka</translation>
     </message>
     <message>
         <source>City</source>
         <translation>Mesto</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Pokrajina</translation>
     </message>
     <message>
         <source>Zip</source>
         <translation>Poštna številka</translation>
     </message>
     <message>
         <source>Country</source>
         <translation>Država</translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation>Polno ime...</translation>
     </message>
     <message>
         <source>Organization</source>
         <translation>Organizacija</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation>Zapiski...</translation>
     </message>
     <message>
         <source>General</source>
         <translation>Splošno</translation>
     </message>
     <message>
         <source>Business</source>
         <translation>Poslovno</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Address</source>
         <translation>Naslov</translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation>Poštna številka</translation>
     </message>
     <message>
         <source>United States</source>
         <translation>Združene države</translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation>Velika Britanija</translation>
     </message>
     <message>
         <source>Japan</source>
         <translation>Japonska</translation>
     </message>
     <message>
         <source>France</source>
         <translation>Francija</translation>
     </message>
     <message>
         <source>Germany</source>
         <translation>Nemčija</translation>
     </message>
     <message>
         <source>Norway</source>
         <translation>Norveška</translation>
     </message>
     <message>
         <source>Canada</source>
         <translation>Kanada</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Moški</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Ženski</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Podrobnosti</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Vpišite zapiske</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Uredi ime</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyztan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/clock.ts b/i18n/sl/clock.ts
index 0062c09..4707cce 100644
--- a/i18n/sl/clock.ts
+++ b/i18n/sl/clock.ts
@@ -1,74 +1,82 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation>Dremež</translation>
     </message>
     <message>
         <source>Clock</source>
         <translation>Ura</translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation>Štoparica</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Ponastavi</translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation>Nastavi alarm</translation>
     </message>
     <message>
         <source>Alarm On</source>
-        <translation>Alarm vključen</translation>
+        <translation type="obsolete">Alarm vključen</translation>
     </message>
     <message>
         <source>Alarm Off</source>
-        <translation>Alarm izključen</translation>
+        <translation type="obsolete">Alarm izključen</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished">PM</translation>
     </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation>Nastavi alarm</translation>
     </message>
     <message>
         <source>Hour</source>
         <translation>Ura</translation>
     </message>
     <message>
         <source>Minute</source>
         <translation>Minuta</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation>Zakasnitev dremeža
 (minut)</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/datebook.ts b/i18n/sl/datebook.ts
index 3d2a871..cd24d39 100644
--- a/i18n/sl/datebook.ts
+++ b/i18n/sl/datebook.ts
@@ -1,910 +1,910 @@
 <!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>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation>TedenSeznam</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation>Alarm in začetni čas...</translation>
     </message>
     <message>
         <source>Default View</source>
         <translation>Privzet pogled</translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation>Dogodek je potencialno daljsi,
 kot interval med ponovitvijo.</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation>Uredi dogodke</translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation>minut)</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Vredu</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation>Koledar ne more shraniti
 vaših sprememb.
 Sprostite nekaj prostora in
 poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation>(Neznano)</translation>
     </message>
     <message>
         <source>Error!</source>
         <translation>Napaka!</translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation>Popravi</translation>
     </message>
     <message>
         <source>Continue</source>
         <translation>Nadaljuj</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation>Obrazec1</translation>
     </message>
     <message>
         <source>M</source>
         <translation>P</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>S</translation>
     </message>
     <message>
         <source>F</source>
         <translation>P</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Ponedeljek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Torek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Sreda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Četrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Petek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Nedelja</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Prežarči</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>:00 PM</translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation>:00 AM</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation>Začni pregledovati dogodke</translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation>Začetni čas:</translation>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation>Nastavitev alarma</translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation>Prednastavitev alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation>Obrazec1</translation>
     </message>
     <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>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation>Obrazec1</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation>Obrazec2</translation>
+        <translation type="obsolete">Obrazec2</translation>
     </message>
     <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>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation>S</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation>Č</translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation>P</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation>S</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation>N</translation>
     </message>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Ponovi...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dnevno...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Tedensko...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Mesečno...</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Letno...</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ne ponovi...</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nov dogodek</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Sestanek</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Kosilo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Večerja</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Potovanje</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="obsolete">Opis:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="obsolete">Začetek</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>00:00</source>
         <translation type="obsolete">00:00</translation>
     </message>
     <message>
         <source>00:30</source>
         <translation type="obsolete">00:30</translation>
     </message>
     <message>
         <source>01:00</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>01:30</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>02:00</source>
         <translation type="obsolete">02:00</translation>
     </message>
     <message>
         <source>02:30</source>
         <translation type="obsolete">02:30</translation>
     </message>
     <message>
         <source>03:00</source>
         <translation type="obsolete">03:00</translation>
     </message>
     <message>
         <source>03:30</source>
         <translation type="obsolete">03:30</translation>
     </message>
     <message>
         <source>04:00</source>
         <translation type="obsolete">04:00</translation>
     </message>
     <message>
         <source>04:30</source>
         <translation type="obsolete">04:30</translation>
     </message>
     <message>
         <source>05:00</source>
         <translation type="obsolete">05:00</translation>
     </message>
     <message>
         <source>05:30</source>
         <translation type="obsolete">05:30</translation>
     </message>
     <message>
         <source>06:00</source>
         <translation type="obsolete">06:00</translation>
     </message>
     <message>
         <source>06:30</source>
         <translation type="obsolete">06:30</translation>
     </message>
     <message>
         <source>07:00</source>
         <translation type="obsolete">07:00</translation>
     </message>
     <message>
         <source>07:30</source>
         <translation type="obsolete">07:30</translation>
     </message>
     <message>
         <source>08:00</source>
         <translation type="obsolete">08:00</translation>
     </message>
     <message>
         <source>08:30</source>
         <translation type="obsolete">08:30</translation>
     </message>
     <message>
         <source>09:00</source>
         <translation type="obsolete">09:00</translation>
     </message>
     <message>
         <source>09:30</source>
         <translation type="obsolete">09:30</translation>
     </message>
     <message>
         <source>10:00</source>
         <translation type="obsolete">10:00</translation>
     </message>
     <message>
         <source>10:30</source>
         <translation type="obsolete">10:30</translation>
     </message>
     <message>
         <source>11:00</source>
         <translation type="obsolete">11:00</translation>
     </message>
     <message>
         <source>11:30</source>
         <translation type="obsolete">11:30</translation>
     </message>
     <message>
         <source>12:00</source>
         <translation type="obsolete">12:00</translation>
     </message>
     <message>
         <source>12:30</source>
         <translation type="obsolete">12:30</translation>
     </message>
     <message>
         <source>13:00</source>
         <translation type="obsolete">13:00</translation>
     </message>
     <message>
         <source>13:30</source>
         <translation type="obsolete">13:30</translation>
     </message>
     <message>
         <source>14:00</source>
         <translation type="obsolete">14:00</translation>
     </message>
     <message>
         <source>14:30</source>
         <translation type="obsolete">14:30</translation>
     </message>
     <message>
         <source>15:00</source>
         <translation type="obsolete">15:00</translation>
     </message>
     <message>
         <source>15:30</source>
         <translation type="obsolete">15:30</translation>
     </message>
     <message>
         <source>16:00</source>
         <translation type="obsolete">16:00</translation>
     </message>
     <message>
         <source>16:30</source>
         <translation type="obsolete">16:30</translation>
     </message>
     <message>
         <source>17:00</source>
         <translation type="obsolete">17:00</translation>
     </message>
     <message>
         <source>17:30</source>
         <translation type="obsolete">17:30</translation>
     </message>
     <message>
         <source>18:00</source>
         <translation type="obsolete">18:00</translation>
     </message>
     <message>
         <source>18:30</source>
         <translation type="obsolete">18:30</translation>
     </message>
     <message>
         <source>19:00</source>
         <translation type="obsolete">19:00</translation>
     </message>
     <message>
         <source>19:30</source>
         <translation type="obsolete">19:30</translation>
     </message>
     <message>
         <source>20:00</source>
         <translation type="obsolete">20:00</translation>
     </message>
     <message>
         <source>20:30</source>
         <translation type="obsolete">20:30</translation>
     </message>
     <message>
         <source>21:00</source>
         <translation type="obsolete">21:00</translation>
     </message>
     <message>
         <source>21:30</source>
         <translation type="obsolete">21:30</translation>
     </message>
     <message>
         <source>22:00</source>
         <translation type="obsolete">22:00</translation>
     </message>
     <message>
         <source>22:30</source>
         <translation type="obsolete">22:30</translation>
     </message>
     <message>
         <source>23:00</source>
         <translation type="obsolete">23:00</translation>
     </message>
     <message>
         <source>23:30</source>
         <translation type="obsolete">23:30</translation>
     </message>
     <message>
         <source>End</source>
         <translation type="obsolete">Konec</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Cel dan</translation>
     </message>
     <message>
         <source>Time zone:</source>
         <translation type="obsolete">Časovni pas:</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Tiho</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Glasno</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ne ponovi...</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Start - End</source>
         <translation>Začetek - Konec</translation>
     </message>
     <message>
         <source>Start time</source>
         <translation>Začetni čas</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Časovni pas</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Vsak %1 %2</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Vsak %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 od vsakega</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Ponedeljek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Torek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Sreda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Četrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Petek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Nedelja</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation></translation>
     </message>
     <message>
         <source>nd</source>
         <translation></translation>
     </message>
     <message>
         <source>rd</source>
         <translation></translation>
     </message>
     <message>
         <source>th</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation>Ne ponovi</translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>tednov</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mesecev</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>let</translation>
     </message>
     <message>
         <source>days</source>
         <translation>dni</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dan</translation>
     </message>
     <message>
         <source>weeks</source>
         <translation>tednov</translation>
     </message>
     <message>
         <source>week</source>
         <translation>teden</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mesec</translation>
     </message>
     <message>
         <source>year</source>
         <translation>leto</translation>
     </message>
     <message>
         <source> and </source>
         <translation>in</translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation>,
 in</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>, in</translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Ponavljajoči dogodek</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dan</translation>
     </message>
     <message>
         <source>Week</source>
         <translation>Teden</translation>
     </message>
     <message>
         <source>Month</source>
         <translation>Mesec</translation>
     </message>
     <message>
         <source>Year</source>
         <translation>Leto</translation>
     </message>
     <message>
         <source>Every:</source>
         <translation>Vsak:</translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation>Frekvenca</translation>
     </message>
     <message>
         <source>End On:</source>
         <translation>Končaj na:</translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation>Brez končnega datuma</translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
         <source>Tue</source>
         <translation>Tor</translation>
     </message>
     <message>
         <source>Wed</source>
         <translation>Sre</translation>
     </message>
     <message>
         <source>Thu</source>
         <translation>Čet</translation>
     </message>
     <message>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>Var1</source>
         <translation>Spremenljivka1</translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation>Spremenljivka 2</translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation>TedenskaSpremenljivka</translation>
     </message>
     <message>
         <source>months</source>
         <translation>meseci</translation>
     </message>
     <message>
         <source>years</source>
         <translation>leta</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/tictac.ts b/i18n/sl/tictac.ts
index 4eb9e18..ab9ecd2 100644
--- a/i18n/sl/tictac.ts
+++ b/i18n/sl/tictac.ts
@@ -1,2 +1,21 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/today.ts b/i18n/sl/today.ts
index a07ef12..e118713 100644
--- a/i18n/sl/today.ts
+++ b/i18n/sl/today.ts
@@ -1,119 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Danes</translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation>&lt;b&gt;Prosim izpolnite poslovno kartico &lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Prosim izpolnite poslovno kartico &lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; BLAH mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="obsolete"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation>Trenutno je &lt;b&gt; 1&lt;/b&gt; tekoče opravilo:  &lt;br&gt;</translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation>Trenutno je &lt;b&gt; %1&lt;/b&gt; tekočih opravil: &lt;br&gt;</translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation>Ni tekočih opravil</translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation>&lt;b&gt;%1&lt;/b&gt; novih sporočil, &lt;b&gt;%2&lt;/b&gt; izhodnih</translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation>OpiePošta ni nameščena</translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation>Nastavitve Danes</translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation>Naj bo 
 lokacija 
 prikazana?</translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation>Naj bodo zapiski 
 prikazani?</translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation>Prikaži samo kasnejše
 zmenke</translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
-        <translation>Koliko 
+        <translation type="obsolete">Koliko 
 zmenkov
 naj bo
 prikazanih?</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation>Koliko opravil
 naj bo 
 prikazanih?</translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation>Opravila</translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation>Odščipni po koliko
 znakih</translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
-        <translation>Naj se danes
+        <translation type="obsolete">Naj se danes
 sam zažene pri
 nadaljevanju? (samo Opie)</translation>
     </message>
     <message>
         <source>Misc</source>
         <translation>Različno</translation>
     </message>
+    <message>
+        <source>How many 
+appointment
+should
+be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Should today be
+autostarted on
+resume? (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/todolist.ts b/i18n/sl/todolist.ts
index 503a0dc..bb2eb18 100644
--- a/i18n/sl/todolist.ts
+++ b/i18n/sl/todolist.ts
@@ -1,164 +1,180 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation>Seznam opravkov</translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation>Novo opravilo</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prednost:</translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation>1 - Zelo visoka</translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation>2 - Visoka</translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation>3 - Normalna</translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation>4 - Nizka</translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation>5 - Zelo nizka</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation>&amp;Končano</translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation>Z&amp;apade</translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation>1 Jan 2001</translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation>K.</translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation>Pred.</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation>Opravki</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation>Ne uspem ustvariti zagonskih datotek
 Sprostite nekaj prostora
 preden vnesete podatke</translation>
     </message>
     <message>
         <source>New Task</source>
         <translation>Novo opravilo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Prežarči</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation>Končana opravila</translation>
     </message>
     <message>
         <source>Task</source>
-        <translation>Opravilo</translation>
+        <translation type="obsolete">Opravilo</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Pogled</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Ne morem urediti podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Uredi opravilo</translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation>Vse kategorije</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Ne uspem
 shraniti vaših sprememb.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/addressbook.ts b/i18n/zh_CN/addressbook.ts
index af328c5..8bfb2bc 100644
--- a/i18n/zh_CN/addressbook.ts
+++ b/i18n/zh_CN/addressbook.ts
@@ -1,1213 +1,1225 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyztan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/clock.ts b/i18n/zh_CN/clock.ts
index eee6707..6426063 100644
--- a/i18n/zh_CN/clock.ts
+++ b/i18n/zh_CN/clock.ts
@@ -1,73 +1,81 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm On</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alarm Off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/datebook.ts b/i18n/zh_CN/datebook.ts
index 6d6005d..7e9de86 100644
--- a/i18n/zh_CN/datebook.ts
+++ b/i18n/zh_CN/datebook.ts
@@ -1,695 +1,695 @@
 <!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>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <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>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</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>Start - End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/tictac.ts b/i18n/zh_CN/tictac.ts
index 4eb9e18..ab9ecd2 100644
--- a/i18n/zh_CN/tictac.ts
+++ b/i18n/zh_CN/tictac.ts
@@ -1,2 +1,21 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_CN/today.ts b/i18n/zh_CN/today.ts
index 67bf2c3..2308942 100644
--- a/i18n/zh_CN/today.ts
+++ b/i18n/zh_CN/today.ts
@@ -1,103 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>How many 
+appointment
+should
+be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Should today be
+autostarted on
+resume? (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/todolist.ts b/i18n/zh_CN/todolist.ts
index d7b7da7..b255358 100644
--- a/i18n/zh_CN/todolist.ts
+++ b/i18n/zh_CN/todolist.ts
@@ -1,157 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index af328c5..8bfb2bc 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -1,1213 +1,1225 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AbTable</name>
     <message>
         <source>Full Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettings</name>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressSettingsBase</name>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the field order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Down</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Write Mail To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Arrange Edit Fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is not enough space to create
 neccessary startup files.
 
 Free up some space before
 entering data!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Small</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Large</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ContactEditor</name>
     <message>
         <source>Fax</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Phone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Emails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suffix</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Job Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Company</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Street 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>P.O. Box</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>City</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>State</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Country</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full Name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Organization</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zip Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United States</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>United Kingdom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Japan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>France</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Germany</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Norway</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Canada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Afganistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Albania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Algeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>American Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Andorra</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Angola</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Anguilla</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Antartica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Argentina</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Armania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aruba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Australia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Austria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Azerbaijan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahamas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bahrain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bangladesh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Barbados</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belarus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belgium</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Belize</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Benin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bermuda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bhutan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boliva</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Botswana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bouvet Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brazil</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Brunei Darussalam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bulgaria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burkina Faso</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Burundi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cambodia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Camaroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cape Verde</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cayman Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chad</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>China</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Christmas Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colombia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comoros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Congo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cook Island</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Costa Rica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cote d&apos;Ivoire</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Croatia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cuba</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cyprus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Czech Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Denmark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Djibouti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dominican Republic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>East Timor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ecuador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Egypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>El Salvador</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Equatorial Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Eritrea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Estonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ethiopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Falkland Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Faroe Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fiji</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Finland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Guiana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>French Polynesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gabon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Georgia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gahna</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gibraltar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greece</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Greenland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Grenada</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadelupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guatemala</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guyana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Haiti</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Holy See</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Honduras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hong Kong</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hungary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Iceland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>India</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Indonesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ireland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Israel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Italy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamacia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jordan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kazakhstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kenya</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Korea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kuait</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyztan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Laos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Latvia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lebanon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lesotho</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liberia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Liechtenstein</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lithuania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Luxembourg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Macedonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Madagascar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malawi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malaysia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Maldives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mali</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Malta</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Martinique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mauritius</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mayotte</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mexico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Micronesia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Moldova</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monaco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mongolia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Montserrat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Morocco</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozambique</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Myanmar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Namibia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nauru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nepal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Netherlands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Caledonia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Zealand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nicaragua</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niger</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nigeria</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Niue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oman</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pakistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Territory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Panama</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Papua New Guinea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paraguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Peru</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Philippines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Poland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Portugal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Puerto Rico</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Qatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reunion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Romania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Russia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rwanda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saint Lucia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Samoa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>San Marino</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saudi Arabia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Senegal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Seychelles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sierra Leone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Singapore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovakia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slovenia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Solomon Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Somalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>South Africa</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spain</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sri Lanka</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>St. Helena</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sudan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suriname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Swaziland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sweden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switzerland</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taiwan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tajikistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tanzania</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thailand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Togo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tokelau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tonga</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tunisia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkey</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Turkmenistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuvalu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uganda</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ukraine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uruguay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Uzbekistan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vanuatu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Venezuela</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Viet Nam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Virgin Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Western Sahara</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yemen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yugoslavia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zambia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Zimbabwe</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/clock.ts b/i18n/zh_TW/clock.ts
index eee6707..6426063 100644
--- a/i18n/zh_TW/clock.ts
+++ b/i18n/zh_TW/clock.ts
@@ -1,73 +1,81 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Clock</name>
     <message>
         <source>Snooze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stopwatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm On</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Alarm Off</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Alarm Is On</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Alarm Is Off</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Set_Alarm</name>
     <message>
         <source>Set Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Minute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Snooze Delay
 (minutes)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index 6d6005d..7e9de86 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -1,695 +1,695 @@
 <!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>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekLst</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm and Start Time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Event duration is potentially longer
 than interval between repeats.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar was unable to save
 your changes.
 Free up some space and try again.
 
 Quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Unknown)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fix it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00 AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start viewing events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm Preset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <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>DateBookWeekLstDayHdrBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>Form2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <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>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <comment>Sunday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</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>Start - End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntry</name>
     <message>
         <source>No Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>weeks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>,
 and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>, and </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Week</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Month</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Year</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Frequency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End On:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No End Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat On</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fri</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Var 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WeekVar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>months</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>years</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/tictac.ts b/i18n/zh_TW/tictac.ts
index 4eb9e18..ab9ecd2 100644
--- a/i18n/zh_TW/tictac.ts
+++ b/i18n/zh_TW/tictac.ts
@@ -1,2 +1,21 @@
 <!DOCTYPE TS><TS>
+<context>
+    <name>TicTacToe</name>
+    <message>
+        <source>Computer starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Human starts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Play!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/today.ts b/i18n/zh_TW/today.ts
index 67bf2c3..2308942 100644
--- a/i18n/zh_TW/today.ts
+++ b/i18n/zh_TW/today.ts
@@ -1,103 +1,124 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Please fill out the business card &lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%1&lt;/b&gt; new mail(s), &lt;b&gt;%2&lt;/b&gt; outgoing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No more appointments today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No appointments today</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Owned by </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please fill out the business card</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Opiemail not installed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>todayconfig</name>
     <message>
         <source>Today config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the 
 location 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should the notes 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later
 appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many 
 appointment
 should should 
 be shown?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many
 tasks should 
 be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip after how
 many letters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Should today be
 autostarted on
 resume ? (Opie only)</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>How many 
+appointment
+should
+be shown?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Should today be
+autostarted on
+resume? (Opie only)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index d7b7da7..b255358 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -1,157 +1,173 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>NewTaskDialog</name>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NewTaskDialogBase</name>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 - Very High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2 - High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>3 - Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4 - Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5 - Very Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>D&amp;ue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1 Jan 2001</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoTable</name>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Prior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TodoWindow</name>
     <message>
         <source>Todo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to create startup files
 Free up some space
 before you enter any data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Task</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Deadline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>