Merge from BRANCH_1_0.

1 files changed, 82 insertions, 57 deletions

diff --git a/i18n/zh_TW/textedit.ts b/i18n/zh_TW/textedit.ts
index c811e7f..5b7b74a 100644
--- a/i18n/zh_TW/textedit.ts
+++ b/i18n/zh_TW/textedit.ts
@@ -1,228 +1,253 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>Text Edit</source>
-        <translation>文字編輯</translation>
-    </message>
-    <message>
-        <source>Write Failed</source>
-        <translation>寫入錯誤</translation>
-    </message>
-    <message>
-        <source>Unnamed</source>
-        <translation>未名命</translation>
-    </message>
-    <message>
-        <source>Text Editor</source>
-        <translation>文字編輯器</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation>全部全部</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation>文字</translation>
-    </message>
-    <message>
-        <source>Permissions</source>
-        <translation>權限</translation>
-    </message>
-    <message>
-        <source>Choose font</source>
-        <translation>選擇字型</translation>
-    </message>
-    <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation>是的</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation>否</translation>
-    </message>
-    <message>
-        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
-        <translation></translation>
-    </message>
-</context>
-<context>
     <name>TextEdit</name>
     <message>
         <source>New</source>
         <translation>新文件</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>開啟</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>存檔</translation>
     </message>
     <message>
         <source>Save As</source>
         <translation>另存新檔</translation>
     </message>
     <message>
         <source>Cut</source>
         <translation>剪下</translation>
     </message>
     <message>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>貼上</translation>
     </message>
     <message>
         <source>Find...</source>
         <translation>尋找...</translation>
     </message>
     <message>
         <source>Zoom in</source>
         <translation>放大</translation>
     </message>
     <message>
         <source>Zoom out</source>
         <translation>縮小</translation>
     </message>
     <message>
         <source>Wrap lines</source>
         <translation>折回行列</translation>
     </message>
     <message>
         <source>Start with new file</source>
         <translation>開始新的檔案</translation>
     </message>
     <message>
         <source>File</source>
         <translation>檔案</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <source>View</source>
         <translation>觀看</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>尋找下一個</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>尋找最近的</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Text Editor</source>
         <translation>文字編輯器</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>字形</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation>關於</translation>
-    </message>
-    <message>
         <source>.desktop File</source>
         <translation>.desktop File</translation>
     </message>
     <message>
         <source>Linked Document</source>
         <translation>Linked Document</translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Text</source>
         <translation>文字</translation>
     </message>
     <message>
         <source>Insert Time and Date</source>
         <translation></translation>
     </message>
     <message>
         <source>Advanced Features</source>
         <translation>進階選項</translation>
     </message>
     <message>
         <source>Prompt on Exit</source>
         <translation>Prompt on Exit</translation>
     </message>
     <message>
         <source>Always open linked file</source>
         <translation>總是開啟Linked檔案</translation>
     </message>
     <message>
         <source>File Permissions</source>
         <translation>檔案權限</translation>
     </message>
     <message>
         <source>Search Bar Open</source>
         <translation>開始Search Bar</translation>
     </message>
+    <message>
+        <source>Goto Line...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto Save 5 min.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Editor has detected&lt;BR&gt;you selected a &lt;B&gt;.desktop&lt;/B&gt;file.&lt;BR&gt;Open&lt;B&gt;.desktop&lt;/B&gt; file or &lt;B&gt;linked&lt;/B&gt; file?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text Edit</source>
+        <translation type="unfinished">文字編輯</translation>
+    </message>
+    <message>
+        <source>Write Failed</source>
+        <translation type="unfinished">寫入錯誤</translation>
+    </message>
+    <message>
+        <source>Unnamed</source>
+        <translation type="unfinished">未名命</translation>
+    </message>
+    <message>
+        <source>Permissions</source>
+        <translation type="unfinished">權限</translation>
+    </message>
+    <message>
+        <source>Choose font</source>
+        <translation type="unfinished">選擇字型</translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
+        <translation type="obsolete">Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished">是的</translation>
+    </message>
+    <message>
+        <source>No</source>
+        <translation type="unfinished">否</translation>
+    </message>
+    <message>
+        <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Textedit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Textedit detected
+you have unsaved changes
+Go ahead and save?
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Don&apos;t Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough lines</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
+from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!&lt;/B&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>設定檔案權限</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>設定檔案權限 :</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>擁有者</translation>
     </message>
     <message>
         <source>group</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>others</source>
         <translation>其他</translation>
     </message>
     <message>
         <source>Owner</source>
         <translation>擁有者</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>read</source>
         <translation>讀</translation>
     </message>
     <message>
         <source>write</source>
         <translation>寫</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>執行</translation>
     </message>
     <message>
         <source>Warning</source>
         <translation>警告</translation>
     </message>
     <message>