Shoot- why did the previous commit fail ?

2 files changed, 180 insertions, 48 deletions

diff --git a/i18n/zh_TW/opie-write.ts b/i18n/zh_TW/opie-write.ts
new file mode 100644
index 0000000..be81c52
--- a/dev/null
+++ b/i18n/zh_TW/opie-write.ts
@@ -0,0 +1,116 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Underline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Underline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Center</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Full</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rich Text Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QTextEdit</name>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cu&amp;t</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select All</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/textedit.ts b/i18n/zh_TW/textedit.ts
index d9e355a..86ab013 100644
--- a/i18n/zh_TW/textedit.ts
+++ b/i18n/zh_TW/textedit.ts
@@ -2,5 +2,5 @@
 <context>
-    <name>@default</name>
+    <name>TextEdit</name>
     <message>
-        <source>Text Edit</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
@@ -8,3 +8,3 @@
     <message>
-        <source>Write Failed</source>
+        <source>Open</source>
         <translation type="unfinished"></translation>
@@ -12,3 +12,3 @@
     <message>
-        <source>Unnamed</source>
+        <source>Save</source>
         <translation type="unfinished"></translation>
@@ -16,3 +16,3 @@
     <message>
-        <source>Text Editor</source>
+        <source>Save As</source>
         <translation type="unfinished"></translation>
@@ -20,3 +20,3 @@
     <message>
-        <source>All</source>
+        <source>Cut</source>
         <translation type="unfinished"></translation>
@@ -24,3 +24,3 @@
     <message>
-        <source>Text</source>
+        <source>Copy</source>
         <translation type="unfinished"></translation>
@@ -28,3 +28,3 @@
     <message>
-        <source>Permissions</source>
+        <source>Paste</source>
         <translation type="unfinished"></translation>
@@ -32,3 +32,3 @@
     <message>
-        <source>Choose font</source>
+        <source>Find...</source>
         <translation type="unfinished"></translation>
@@ -36,4 +36,3 @@
     <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>
+        <source>Zoom in</source>
         <translation type="unfinished"></translation>
@@ -41,3 +40,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Yes</source>
+        <source>Zoom out</source>
         <translation type="unfinished"></translation>
@@ -45,3 +44,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>No</source>
+        <source>Wrap lines</source>
         <translation type="unfinished"></translation>
@@ -49,10 +48,7 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <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>
+        <source>Start with new file</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TextEdit</name>
     <message>
-        <source>New</source>
+        <source>File</source>
         <translation type="unfinished"></translation>
@@ -60,3 +56,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Open</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
@@ -64,3 +60,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Save</source>
+        <source>View</source>
         <translation type="unfinished"></translation>
@@ -68,3 +64,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Save As</source>
+        <source>Find Next</source>
         <translation type="unfinished"></translation>
@@ -72,3 +68,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Cut</source>
+        <source>Close Find</source>
         <translation type="unfinished"></translation>
@@ -76,3 +72,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Copy</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
@@ -80,3 +76,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Paste</source>
+        <source>Text Editor</source>
         <translation type="unfinished"></translation>
@@ -84,3 +80,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Find...</source>
+        <source>Font</source>
         <translation type="unfinished"></translation>
@@ -88,3 +84,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Zoom in</source>
+        <source>.desktop File</source>
         <translation type="unfinished"></translation>
@@ -92,3 +88,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Zoom out</source>
+        <source>Linked Document</source>
         <translation type="unfinished"></translation>
@@ -96,3 +92,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Wrap lines</source>
+        <source>All</source>
         <translation type="unfinished"></translation>
@@ -100,3 +96,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Start with new file</source>
+        <source>Text</source>
         <translation type="unfinished"></translation>
@@ -104,3 +100,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>File</source>
+        <source>Insert Time and Date</source>
         <translation type="unfinished"></translation>
@@ -108,3 +104,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Edit</source>
+        <source>Advanced Features</source>
         <translation type="unfinished"></translation>
@@ -112,3 +108,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>View</source>
+        <source>Prompt on Exit</source>
         <translation type="unfinished"></translation>
@@ -116,3 +112,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Find Next</source>
+        <source>Always open linked file</source>
         <translation type="unfinished"></translation>
@@ -120,3 +116,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Close Find</source>
+        <source>File Permissions</source>
         <translation type="unfinished"></translation>
@@ -124,3 +120,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Delete</source>
+        <source>Search Bar Open</source>
         <translation type="unfinished"></translation>
@@ -128,3 +124,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Text Editor</source>
+        <source>Goto Line...</source>
         <translation type="unfinished"></translation>
@@ -132,3 +128,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Font</source>
+        <source>Auto Save 5 min.</source>
         <translation type="unfinished"></translation>
@@ -136,3 +132,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>About</source>
+        <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>
@@ -140,3 +136,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>.desktop File</source>
+        <source>Text Edit</source>
         <translation type="unfinished"></translation>
@@ -144,3 +140,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Linked Document</source>
+        <source>Write Failed</source>
         <translation type="unfinished"></translation>
@@ -148,3 +144,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>All</source>
+        <source>Unnamed</source>
         <translation type="unfinished"></translation>
@@ -152,3 +148,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Text</source>
+        <source>Permissions</source>
         <translation type="unfinished"></translation>
@@ -156,3 +152,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Insert Time and Date</source>
+        <source>Choose font</source>
         <translation type="unfinished"></translation>
@@ -160,3 +156,4 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Advanced Features</source>
+        <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>
@@ -164,3 +161,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Prompt on Exit</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
@@ -168,3 +165,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Always open linked file</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
@@ -172,3 +169,3 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>File Permissions</source>
+        <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>
@@ -176,3 +173,22 @@ from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
     <message>
-        <source>Search Bar Open</source>
+        <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>