Merge from BRANCH_1_0.

1 files changed, 53 insertions, 26 deletions

diff --git a/i18n/xx/datebook.ts b/i18n/xx/datebook.ts
index 6ec4651..1ef712c 100644
--- a/i18n/xx/datebook.ts
+++ b/i18n/xx/datebook.ts
@@ -87,12 +87,16 @@ Quit anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit...</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>error box</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayHeaderBase</name>
     <message>
         <source>M</source>
         <translation>FOO</translation>
@@ -184,12 +188,16 @@ Quit anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Beam this occurence</source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>DateBookSettings</name>
     <message>
         <source>:00 PM</source>
         <translation>FOO</translation>
@@ -209,13 +217,13 @@ Quit anyway?</source>
     <message>
         <source>:00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar</source>
-        <translation type="unfinished">FOO</translation>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookSettingsBase</name>
     <message>
         <source>Preferences</source>
@@ -308,29 +316,29 @@ Quit anyway?</source>
     <message>
         <source>Start-End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Defaults</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation type="unfinished">FOO</translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished">FOO</translation>
+        <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
@@ -338,27 +346,35 @@ Quit anyway?</source>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
-        <translation type="unfinished"></translation>
+        <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
@@ -369,49 +385,49 @@ Quit anyway?</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
-        <source>M</source>
-        <comment>Monday</comment>
+        <source>p</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Mo</source>
+        <comment>Monday</comment>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Tu</source>
         <comment>Tuesday</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>W</source>
+        <source>We</source>
         <comment>Wednesday</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>T</source>
+        <source>Th</source>
         <comment>Thursday</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>F</source>
+        <source>Fr</source>
         <comment>Friday</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Sa</source>
         <comment>Saturday</comment>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
-        <source>S</source>
+        <source>Su</source>
         <comment>Sunday</comment>
-        <translation>FOO</translation>
-    </message>
-    <message>
-        <source>p</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
@@ -539,12 +555,19 @@ Quit anyway?</source>
     <message>
         <source>Note...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>DatebookAlldayDisp</name>
+    <message>
+        <source>Info</source>
+        <translation>FOO</translation>
+    </message>
+</context>
+<context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -698,12 +721,16 @@ and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>, and </source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>on </source>
+        <translation>FOO</translation>
+    </message>
 </context>
 <context>
     <name>RepeatEntryBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>FOO</translation>