Merge from BRANCH_1_0.

1 files changed, 17 insertions, 10 deletions

diff --git a/i18n/zh_TW/libtodaydatebookplugin.ts b/i18n/zh_TW/libtodaydatebookplugin.ts
index e392d58..05721f2 100644
--- a/i18n/zh_TW/libtodaydatebookplugin.ts
+++ b/i18n/zh_TW/libtodaydatebookplugin.ts
@@ -1,83 +1,90 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>All day</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatebookPluginConfig</name>
+</context>
+<context>
+    <name>DatebookPluginConfigBase</name>
+    <message>
+        <source>DatebookPluginConfigBase</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show only later
- appointments</source>
+        <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
+        <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days</source>
+        <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>How many more days should be in the range</source>
+        <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> day(s)</source>
+        <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>only today</source>
+        <source>How many more days</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Datebook plugin</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>
 </context>
 </TS>