Merge from BRANCH_1_0.

1 files changed, 11 insertions, 1 deletions

diff --git a/i18n/es/textedit.ts b/i18n/es/textedit.ts
index 2e2ca4b..3546cc3 100644
--- a/i18n/es/textedit.ts
+++ b/i18n/es/textedit.ts
@@ -147,25 +147,25 @@
     </message>
     <message>
         <source>Permissions</source>
         <translation>Permisos</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>Elegir Letra</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>¿Seguro que quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
+        <translation type="obsolete">¿Seguro que quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
 del disco?&lt;BR&gt;¡¡Es &lt;B&gt;irreversible&lt;/B&gt;!!</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</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>
@@ -187,24 +187,34 @@ tiene cambios sin salvar.
     <message>
         <source>Don&apos;t Save</source>
         <translation>No guardar</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Cancelar</translation>
     </message>
     <message>
         <source>Not enough lines</source>
         <translation>Líneas insuficientes</translation>
     </message>
+    <message>
+        <source>%1 - Text Editor</source>
+        <translation>%1 - Editor de Textos</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>¿Seguro que quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
+del disco?&lt;BR&gt;¡Es &lt;B&gt;irreversible&lt;/B&gt;!</translation>
+    </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fije los Permisos del Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos fichero para:</translation>
     </message>
     <message>