diff --git a/source/distro/changelog.txt b/source/distro/changelog.txt
index 949a7dd..ae0968d 100644
--- a/source/distro/changelog.txt
+++ b/source/distro/changelog.txt
@@ -2,6 +2,12 @@ Changelog for Writer2LaTeX version 0.5 -> 1.0
 
 ---------- version 1.0 beta ----------
 
+[w2l] Bugfix: Added missing hyperlink targets for frames and graphics
+
+[w2x] Bugfix: Fixed null pointer exception for text frames without height attribute
+
+[w2l] Added spanish translation from Emilio José Juárez Pérez
+
 [w2l] Added support for bitmap graphics with backend=dvips
 
 [all] No longer create source distribution (SourceForge provides tarballs generated
diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/EPSCleaner.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/EPSCleaner.java
new file mode 100644
index 0000000..745a7f5
--- /dev/null
+++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/EPSCleaner.java
@@ -0,0 +1,87 @@
+/************************************************************************
+ *
+ *  EPSCleaner.java
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *  Copyright: 2002-2009 by Henrik Just
+ *  
+ *  All Rights Reserved.
+ *
+ *  Version 1.0 (2009-03-09)
+ */
+ 
+package org.openoffice.da.comp.w2lcommon.filter;
+
+/** This class removes redundant binary information from EPS files created by OOo.
+ *  See the issue http://qa.openoffice.org/issues/show_bug.cgi?id=25256
+ *  According to this message http://markmail.org/message/dc6rprmtktxuq35v
+ *  on dev@openoffice.org the binary data is an EPSI preview in TIFF format
+ *  TODO: Is it possible to avoid this export?
+ */
+public class EPSCleaner {
+
+    // Signatures for start and end in eps
+    private byte[] psStart;
+    private byte[] psEnd;
+    
+    public EPSCleaner() {
+        try {
+            psStart = "%!PS-Adobe".getBytes("US-ASCII");
+            psEnd = "%%EOF".getBytes("US-ASCII");
+        }
+        catch (java.io.UnsupportedEncodingException ex) {
+            // US-ASCII *is* supported :-)
+        }
+            
+    }
+	
+    // 
+    public byte[] cleanEps(byte[] blob) {
+        int n = blob.length;
+
+        int nStart = 0;
+        for (int i=0; i<n; i++) {
+            if (match(blob,psStart,i)) {
+                nStart=i;
+                break;
+            }
+        }
+
+        int nEnd = n;
+        for (int i=nStart; i<n; i++) {
+            if (match(blob,psEnd,i)) {
+                nEnd=i+psEnd.length;
+                break;
+            }
+        }
+		
+        byte[] newBlob = new byte[nEnd-nStart];
+        System.arraycopy(blob,nStart,newBlob,0,nEnd-nStart);
+        return newBlob;        
+    }
+	
+    private boolean match(byte[] blob, byte[] sig, int nStart) {
+        int n = sig.length;
+        if (nStart+n>=blob.length) { return false; }
+        for (int i=0; i<n; i++) {
+            if (blob[nStart+i]!=sig[i]) { return false; }
+        }
+        return true;
+    }
+
+
+}
+
diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl1.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl1.java
index d2faa17..7e3ed70 100644
--- a/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl1.java
+++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl1.java
@@ -16,12 +16,14 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2008 by Henrik Just
+ *  Copyright: 2002-2009 by Henrik Just
  *
  *  All Rights Reserved.
+ *  
+ *  Version 1.0 (2009-03-08)
  */
 
-// Version 1.0 (2008-11-22)
+// 
  
 package org.openoffice.da.comp.w2lcommon.filter;
 
@@ -51,12 +53,9 @@ import writer2latex.api.MIMETypes;
  */
 public class GraphicConverterImpl1 implements GraphicConverter {
 
-    // Signatures for start and end in exp
-    private byte[] psStart;
-    private byte[] psEnd;
-    
-    
     private XGraphicProvider xGraphicProvider;
+    
+    private EPSCleaner epsCleaner;
 	
     public GraphicConverterImpl1(XComponentContext xComponentContext) {
         try {
@@ -69,13 +68,8 @@ public class GraphicConverterImpl1 implements GraphicConverter {
             System.err.println("Failed to get XGraphicProvider object");
             xGraphicProvider = null;
         }
-        try {
-            psStart = "%!PS-Adobe".getBytes("US-ASCII");
-            psEnd = "%%EOF".getBytes("US-ASCII");
-        }
-        catch (java.io.UnsupportedEncodingException ex) {
-            // US-ASCII *is* supported :-)
-        }
+        
+        epsCleaner = new EPSCleaner();
             
     }
 	
@@ -136,7 +130,7 @@ public class GraphicConverterImpl1 implements GraphicConverter {
             xTarget.closeOutput();
             xTarget.flush();
             if (MIMETypes.EPS.equals(sTargetMime)) {
-                return cleanEps(xTarget.getBuffer());
+                return epsCleaner.cleanEps(xTarget.getBuffer());
             }
             else {
                 return xTarget.getBuffer();
@@ -156,39 +150,5 @@ public class GraphicConverterImpl1 implements GraphicConverter {
         }
     } 
 	
-    private byte[] cleanEps(byte[] blob) {
-        int n = blob.length;
-
-        int nStart = 0;
-        for (int i=0; i<n; i++) {
-            if (match(blob,psStart,i)) {
-                nStart=i;
-                break;
-            }
-        }
-
-        int nEnd = n;
-        for (int i=nStart; i<n; i++) {
-            if (match(blob,psEnd,i)) {
-                nEnd=i+psEnd.length;
-                break;
-            }
-        }
-		
-        byte[] newBlob = new byte[nEnd-nStart];
-        System.arraycopy(blob,nStart,newBlob,0,nEnd-nStart);
-        return newBlob;        
-    }
-	
-    private boolean match(byte[] blob, byte[] sig, int nStart) {
-        int n = sig.length;
-        if (nStart+n>=blob.length) { return false; }
-        for (int i=0; i<n; i++) {
-            if (blob[nStart+i]!=sig[i]) { return false; }
-        }
-        return true;
-    }
-
-
 }
 
diff --git a/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java b/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java
index eb6c3a8..f1364a3 100644
--- a/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java
+++ b/source/java/org/openoffice/da/comp/w2lcommon/filter/GraphicConverterImpl2.java
@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-03-02)
+ *  Version 1.0 (2009-03-08)
  *
  */
  
@@ -60,6 +60,7 @@ public class GraphicConverterImpl2 implements GraphicConverter {
     private XComponentContext xComponentContext;
     private Hashtable importFilter;
     private Hashtable exportFilter;
+    private EPSCleaner epsCleaner;
 
     public GraphicConverterImpl2(XComponentContext xComponentContext) {
         this.xComponentContext = xComponentContext;
@@ -87,6 +88,8 @@ public class GraphicConverterImpl2 implements GraphicConverter {
         exportFilter.put(MIMETypes.TIFF,"draw_tif_Export");
         exportFilter.put(MIMETypes.WMF,"draw_wmf_Export");
         exportFilter.put(MIMETypes.PDF,"draw_pdf_Export");
+        
+        epsCleaner = new EPSCleaner();
     }
 	
     public boolean supportsConversion(String sSourceMime, String sTargetMime, boolean bCrop, boolean bResize) {
@@ -109,8 +112,6 @@ public class GraphicConverterImpl2 implements GraphicConverter {
         // Open a hidden sdraw document
         XMultiComponentFactory xMCF = xComponentContext.getServiceManager();
 
-org.openoffice.da.comp.w2lcommon.helper.MessageBox msgBox = new org.openoffice.da.comp.w2lcommon.helper.MessageBox(xComponentContext);
-
         try {
             // Load the graphic into a new draw document as xDocument
             // using a named filter
@@ -119,7 +120,6 @@ org.openoffice.da.comp.w2lcommon.helper.MessageBox msgBox = new org.openoffice.d
 
             XComponentLoader xComponentLoader = (XComponentLoader)
                 UnoRuntime.queryInterface(XComponentLoader.class, desktop);
-//msgBox.showMessage("Graphics","Trying to load using filter name "+importFilter.get(sSourceMime));
 
             PropertyValue[] fileProps = new PropertyValue[3];
             fileProps[0] = new PropertyValue();
@@ -187,30 +187,28 @@ org.openoffice.da.comp.w2lcommon.helper.MessageBox msgBox = new org.openoffice.d
 
             byte[] result = outputStream.getBuffer();
             xDocument.dispose(); 
-				
-            return result;
+            
+            if (MIMETypes.EPS.equals(sTargetMime)) {
+            	return epsCleaner.cleanEps(result);
+            }
+            else {
+            	return result;
+            }
  
         }
         catch (com.sun.star.beans.PropertyVetoException e) {
-msgBox.showMessage("Exception",e.toString());
         }
         catch (com.sun.star.beans.UnknownPropertyException e) {
-msgBox.showMessage("Exception",e.toString());
         }
         catch (com.sun.star.io.IOException e) {
-msgBox.showMessage("Exception",e.toString());
         }
         catch (com.sun.star.lang.IllegalArgumentException e) {
-msgBox.showMessage("Exception",e.toString());
         }
         catch (com.sun.star.lang.IndexOutOfBoundsException e) {
-msgBox.showMessage("Exception",e.toString());
         }
         catch (com.sun.star.lang.WrappedTargetException e) {
-msgBox.showMessage("Exception",e.toString());
         }
         catch (com.sun.star.uno.Exception e) {
-msgBox.showMessage("Exception",e.toString());
         }
 
         // Conversion failed, for whatever reason
diff --git a/source/java/writer2latex/api/ConverterFactory.java b/source/java/writer2latex/api/ConverterFactory.java
index 0bf073b..2e6f25a 100644
--- a/source/java/writer2latex/api/ConverterFactory.java
+++ b/source/java/writer2latex/api/ConverterFactory.java
@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-03-02)
+ *  Version 1.0 (2009-03-08)
  *
  */
  
@@ -33,7 +33,7 @@ public class ConverterFactory {
 
     // Version information
     private static final String VERSION = "1.0 beta";
-    private static final String DATE = "2008-03-02";
+    private static final String DATE = "2008-03-08";
 	
     /** Return version information
      *  @return the Writer2LaTeX version in the form
diff --git a/source/java/writer2latex/bibtex/BibTeXDocument.java b/source/java/writer2latex/bibtex/BibTeXDocument.java
index 8411de1..b2f061e 100644
--- a/source/java/writer2latex/bibtex/BibTeXDocument.java
+++ b/source/java/writer2latex/bibtex/BibTeXDocument.java
@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-02-17)
+ *  Version 1.0 (2009-03-08)
  *
  */
 
@@ -120,7 +120,7 @@ public class BibTeXDocument implements Document {
         // BibTeX files are plain ascii
         OutputStreamWriter osw = new OutputStreamWriter(os,"ASCII");
         osw.write("%% This file was converted to BibTeX by Writer2BibTeX ver. "+ConverterFactory.getVersion()+".\n");
-        osw.write("%% See http://www.hj-gym.dk/~hj/writer2latex for more info.\n");
+        osw.write("%% See http://writer2latex.sourceforge.net for more info.\n");
         osw.write("\n");
         Enumeration enumeration = entries.elements();
         while (enumeration.hasMoreElements()) {
diff --git a/source/java/writer2latex/latex/DrawConverter.java b/source/java/writer2latex/latex/DrawConverter.java
index 77d126f..cba99d0 100644
--- a/source/java/writer2latex/latex/DrawConverter.java
+++ b/source/java/writer2latex/latex/DrawConverter.java
@@ -20,7 +20,7 @@
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2009-02-17)
+ *  Version 1.0 (2009-03-08)
  *
  */
  
@@ -251,8 +251,8 @@ public class DrawConverter extends ConverterHelper {
         }
 
         Element frame = getFrame(node);
-        //String sName = frame.getAttribute(XMLString.DRAW_NAME);
-        palette.getFieldCv().addTarget(frame,"|graphics",ldp);
+        String sName = frame.getAttribute(XMLString.DRAW_NAME);
+        palette.getFieldCv().addTarget(sName,"|graphic",ldp);
         String sAnchor = frame.getAttribute(XMLString.TEXT_ANCHOR_TYPE);
 
         // TODO: Recognize Jex equations (needs further testing of Jex)
@@ -421,8 +421,8 @@ public class DrawConverter extends ConverterHelper {
 	
     private void handleDrawTextBox(Element node, LaTeXDocumentPortion ldp, Context oc) {
         Element frame = getFrame(node);
-        //String sName = frame.getAttribute(XMLString.DRAW_NAME);
-        palette.getFieldCv().addTarget(frame,"|frame",ldp);
+        String sName = frame.getAttribute(XMLString.DRAW_NAME);
+        palette.getFieldCv().addTarget(sName,"|frame",ldp);
         String sAnchor = frame.getAttribute(XMLString.TEXT_ANCHOR_TYPE);
         //if (oc.isInFrame() || "as-char".equals(sAnchor)) {
         if ("as-char".equals(sAnchor)) {
diff --git a/source/java/writer2latex/xhtml/DrawConverter.java b/source/java/writer2latex/xhtml/DrawConverter.java
index db29009..93d7363 100644
--- a/source/java/writer2latex/xhtml/DrawConverter.java
+++ b/source/java/writer2latex/xhtml/DrawConverter.java
@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2008 by Henrik Just
+ *  Copyright: 2002-2009 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2008-12-15)
+ *  Version 1.0 (2009-03-08)
  *
  */
  
@@ -760,7 +760,7 @@ public class DrawConverter extends ConverterHelper {
     	// We thus have to subtract the borders and padding to get the correct width
         StyleWithProperties style = ofr.getFrameStyle(node.getAttribute(XMLString.DRAW_STYLE_NAME));
         
-        String sWidth = Misc.getAttribute(node,XMLString.SVG_WIDTH);
+        String sWidth = node.getAttribute(XMLString.SVG_WIDTH);
         if (sWidth.length()>0) {
         	if (style!=null) {
         		// Subtract padding
@@ -782,7 +782,7 @@ public class DrawConverter extends ConverterHelper {
             props.addValue("width",scale(sWidth));
         }
         
-        String sHeight = Misc.getAttribute(node,XMLString.SVG_HEIGHT);
+        String sHeight = node.getAttribute(XMLString.SVG_HEIGHT);
         if (sHeight.length()>0 && !bOnlyWidth) {
         	if (style!=null) {
         		// Subtract padding
diff --git a/source/java/writer2latex/xhtml/L10n.java b/source/java/writer2latex/xhtml/L10n.java
index 964c157..d9f8f75 100644
--- a/source/java/writer2latex/xhtml/L10n.java
+++ b/source/java/writer2latex/xhtml/L10n.java
@@ -16,11 +16,11 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  *  MA  02111-1307  USA
  *
- *  Copyright: 2002-2008 by Henrik Just
+ *  Copyright: 2002-2009 by Henrik Just
  *
  *  All Rights Reserved.
  * 
- *  Version 1.0 (2008-12-16)
+ *  Version 1.0 (2009-03-05)
  *
  */
 
@@ -81,6 +81,20 @@ public class L10n {
             	case DOCUMENT: return "Document";
             }
         }
+        if (sLocale.startsWith("es")) { // spanish
+            switch (nString) {
+                case UP: return "Arriba";
+                case FIRST : return "Primero";
+                case PREVIOUS : return "Previo";
+                case NEXT : return "Siguiente";
+                case LAST : return "\u00daltimo";
+                case CONTENTS : return "Contenido";
+                case INDEX : return "\u00cdndice";
+                case HOME : return "Inicio";
+                case DIRECTORY: return "Directorio";
+                case DOCUMENT: return "Documento";
+            }
+        }
         if (sLocale.startsWith("da")) { // danish
             switch (nString) {
                 case UP: return "Op";
diff --git a/source/oxt/writer2latex/W2LDialogs/DialogStrings_es_ES.properties b/source/oxt/writer2latex/W2LDialogs/DialogStrings_es_ES.properties
new file mode 100644
index 0000000..3524c56
--- /dev/null
+++ b/source/oxt/writer2latex/W2LDialogs/DialogStrings_es_ES.properties
@@ -0,0 +1,111 @@
+# LaTeXOptions strings=
+0.LaTeXOptions.HelpText=
+1.LaTeXOptions.Title=Opciones de LaTeX (Writer2LaTeX)
+2.LaTeXOptions.FixedLine1.HelpText=
+3.LaTeXOptions.FixedLine1.Label=
+4.LaTeXOptions.GeneralLabel.HelpText=
+5.LaTeXOptions.GeneralLabel.Label=General
+6.LaTeXOptions.ConfigLabel.HelpText=
+7.LaTeXOptions.ConfigLabel.Label=Formato LaTeX
+8.LaTeXOptions.Config.HelpText=
+137.Config.StringItemList=Art\u00edculo muy simple
+138.Config.StringItemList=Art\u00edculo simple
+139.Config.StringItemList=Por defecto
+140.Config.StringItemList=Impresi\u00f3n optimizada
+141.Config.StringItemList=Optimizado para pantalla (pdf)
+142.Config.StringItemList=Personalizado
+15.LaTeXOptions.BackendLabel.HelpText=
+16.LaTeXOptions.BackendLabel.Label=Formato Final
+17.LaTeXOptions.Backend.HelpText=
+116.Backend.StringItemList=Gen\u00e9rico
+117.Backend.StringItemList=Pdf (pdfTeX)
+118.Backend.StringItemList=Postscript (dvips)
+119.Backend.StringItemList=No especificado
+22.LaTeXOptions.InputencodingLabel.HelpText=
+23.LaTeXOptions.InputencodingLabel.Label=Codificaci\u00f3n
+24.LaTeXOptions.Inputencoding.HelpText=
+120.Inputencoding.StringItemList=US ASCII
+121.Inputencoding.StringItemList=West European (ISO 8859-1)
+122.Inputencoding.StringItemList=East European (ISO 8859-2)
+123.Inputencoding.StringItemList=Latin/Greek (ISO 8859-7)
+124.Inputencoding.StringItemList=Microsoft East European (Cp1250)
+125.Inputencoding.StringItemList=Microsoft Cyrillic (Cp1251)
+126.Inputencoding.StringItemList=Russian (koi8-r)
+127.Inputencoding.StringItemList=Unicode (UTF8)
+33.LaTeXOptions.Multilingual.HelpText=
+34.LaTeXOptions.Multilingual.Label=Habilitar soporte multil\u00edng\u00fce
+35.LaTeXOptions.GreekMath.HelpText=
+36.LaTeXOptions.GreekMath.Label=Usar letras griegas como s\u00edmbolos
+37.LaTeXOptions.AdditionalSymbols.HelpText=
+38.LaTeXOptions.AdditionalSymbols.Label=Habilitar soporte a s\u00edmbolos adicionales
+39.LaTeXOptions.BibliographyLabel.HelpText=
+40.LaTeXOptions.BibliographyLabel.Label=Bibliograf\u00eda
+41.LaTeXOptions.UseBibtex.HelpText=
+42.LaTeXOptions.UseBibtex.Label=Usar BibTeX para bibliograf\u00eda
+43.LaTeXOptions.BibtexStyleLabel.HelpText=
+44.LaTeXOptions.BibtexStyleLabel.Label=Estilo BibTeX
+45.LaTeXOptions.BibtexStyle.HelpText=
+46.BibtexStyle.StringItemList=plain
+47.BibtexStyle.StringItemList=unsrt
+48.BibtexStyle.StringItemList=alpha
+49.BibtexStyle.StringItemList=abbrv
+50.LaTeXOptions.BibtexStyle.Text=
+51.LaTeXOptions.FilesLabel.HelpText=
+52.LaTeXOptions.FilesLabel.Label=Archivos
+53.LaTeXOptions.WrapLines.HelpText=
+54.LaTeXOptions.WrapLines.Label=Ajustar lineas largas
+55.LaTeXOptions.WrapLinesAfterLabel.HelpText=
+56.LaTeXOptions.WrapLinesAfterLabel.Label=Despu\u00e9s de car\u00e1cter
+57.LaTeXOptions.WrapLinesAfter.HelpText=
+58.LaTeXOptions.SplitLinkedSections.HelpText=
+59.LaTeXOptions.SplitLinkedSections.Label=Separar documento en secciones conectadas
+60.LaTeXOptions.SplitToplevelSections.HelpText=
+61.LaTeXOptions.SplitToplevelSections.Label=Separar documento al nivel m\u00e1s alto de secci\u00f3n
+62.LaTeXOptions.SaveImagesInSubdir.HelpText=
+63.LaTeXOptions.SaveImagesInSubdir.Label=Salvar im\u00e1genes en subdirectorio
+64.LaTeXOptions.SpecialContentLabel.HelpText=
+65.LaTeXOptions.SpecialContentLabel.Label=Contenido especial
+66.LaTeXOptions.NotesLabel.HelpText=
+67.LaTeXOptions.NotesLabel.Label=Exportar notas
+68.LaTeXOptions.Notes.HelpText=
+128.Notes.StringItemList=No exportar
+129.Notes.StringItemList=como comentarios
+130.Notes.StringItemList=como notas al margen
+131.Notes.StringItemList=como anotaciones al pdf
+73.LaTeXOptions.Metadata.HelpText=
+74.LaTeXOptions.Metadata.Label=Exportar propiedades del documento (metadatos)
+75.LaTeXOptions.FiguresAndTablesLabel.HelpText=
+76.LaTeXOptions.FiguresAndTablesLabel.Label=Figuras y tablas
+77.LaTeXOptions.OriginalImageSize.HelpText=
+78.LaTeXOptions.OriginalImageSize.Label=Usar tama\u00f1o original de la imagen
+79.LaTeXOptions.OptimizeSimpleTables.HelpText=
+80.LaTeXOptions.OptimizeSimpleTables.Label=Optimizar tablas simples
+81.LaTeXOptions.SimpleTableLimitLabel.HelpText=
+82.LaTeXOptions.SimpleTableLimitLabel.Label=Anchura m\u00e1xima en caracteres
+83.LaTeXOptions.SimpleTableLimit.HelpText=
+84.LaTeXOptions.FloatTables.HelpText=
+85.LaTeXOptions.FloatTables.Label=Tablas flotantes
+86.LaTeXOptions.FloatFigures.HelpText=
+87.LaTeXOptions.FloatFigures.Label=Figuras flotantes
+88.LaTeXOptions.FloatOptionsLabel.HelpText=
+89.LaTeXOptions.FloatOptionsLabel.Label=Zona flotante
+90.LaTeXOptions.FloatOptions.HelpText=
+132.FloatOptions.StringItemList=Arriba o abajo en la p\u00e1gina
+133.FloatOptions.StringItemList=Arriba de la p\u00e1gina
+134.FloatOptions.StringItemList=Abajo de la p\u00e1gina
+135.FloatOptions.StringItemList=Aqu\u00ed o en lo alto de la p\u00e1gina
+136.FloatOptions.StringItemList=Aqu\u00ed o en lo bajo de la p\u00e1gina.
+96.LaTeXOptions.AutoCorrectLabel.HelpText=
+97.LaTeXOptions.AutoCorrectLabel.Label=AutoCorregir
+98.LaTeXOptions.IgnoreHardPageBreaks.HelpText=
+99.LaTeXOptions.IgnoreHardPageBreaks.Label=Ignorar saltos de p\u00e1gina
+100.LaTeXOptions.IgnoreHardLineBreaks.HelpText=
+101.LaTeXOptions.IgnoreHardLineBreaks.Label=Ignorar saltos de l\u00ednea
+102.LaTeXOptions.IgnoreEmptyParagraphs.HelpText=
+103.LaTeXOptions.IgnoreEmptyParagraphs.Label=Ignorar p\u00e1rrafos
+104.LaTeXOptions.IgnoreDoubleSpaces.HelpText=
+105.LaTeXOptions.IgnoreDoubleSpaces.Label=Ignorar espacios dobles
+106.LaTeXOptions.ExportButton.HelpText=
+107.LaTeXOptions.ExportButton.Label=Exportar  
+108.LaTeXOptions.CancelButton.HelpText=
+109.LaTeXOptions.CancelButton.Label=Cancelar
diff --git a/source/oxt/writer2latex/desc_es.txt b/source/oxt/writer2latex/desc_es.txt
new file mode 100644
index 0000000..5a36e33
--- /dev/null
+++ b/source/oxt/writer2latex/desc_es.txt
@@ -0,0 +1 @@
+Writer2LaTeX contiene filtros de Writer para exportar a LaTeX y BibTeX 
\ No newline at end of file
diff --git a/source/oxt/writer2latex/description.xml b/source/oxt/writer2latex/description.xml
index 3997015..c5b1f47 100644
--- a/source/oxt/writer2latex/description.xml
+++ b/source/oxt/writer2latex/description.xml
@@ -15,7 +15,8 @@
     <name lang="da">Writer2LaTeX eksportfiltre</name>
     <name lang="en">Writer2LaTeX export filters</name>
     <name lang="de">Writer2Latex Exportfilter</name>
-    <name lang="de">Filtres d'exportation Writer2LaTeX</name>
+    <name lang="es">Writer2LaTeX filtros para exportar</name>
+    <name lang="fr">Filtres d'exportation Writer2LaTeX</name>
     <name lang="ru">Фильтры экспорта Writer2LaTeX</name>
     <name lang="uk">Фільтри експорту Writer2LaTeX</name>
   </display-name>
@@ -24,6 +25,7 @@
     <src xlink:href="description/desc_da.txt" lang="da" />
     <src xlink:href="description/desc_en.txt" lang="en" />
     <src xlink:href="description/desc_de.txt" lang="de" />
+    <src xlink:href="description/desc_es.txt" lang="es" />
     <src xlink:href="description/desc_fr.txt" lang="fr" />
     <src xlink:href="description/desc_ru.txt" lang="ru" />
     <src xlink:href="description/desc_uk.txt" lang="uk" />
diff --git a/source/oxt/writer2xhtml/W2XDialogs/DialogStrings_es_ES.properties b/source/oxt/writer2xhtml/W2XDialogs/DialogStrings_es_ES.properties
new file mode 100644
index 0000000..a465bf2
--- /dev/null
+++ b/source/oxt/writer2xhtml/W2XDialogs/DialogStrings_es_ES.properties
@@ -0,0 +1,131 @@
+# Strings for Dialog Library W2XDialogs=
+0.XhtmlOptions.HelpText=
+1.XhtmlOptions.Title=Opciones para XHTML (Writer2xhtml)
+2.XhtmlOptions.StyleLabel.HelpText=
+3.XhtmlOptions.StyleLabel.Label=Estilo
+4.XhtmlOptions.ConfigLabel.HelpText=
+5.XhtmlOptions.ConfigLabel.Label=Usar estilo
+6.XhtmlOptions.Config.HelpText=
+17.XhtmlOptions.ScalingLabel.HelpText=
+18.XhtmlOptions.ScalingLabel.Label=Escalado
+19.XhtmlOptions.Scaling.HelpText=
+20.XhtmlOptions.ScalingPercentLabel.HelpText=
+21.XhtmlOptions.ScalingPercentLabel.Label=%
+22.XhtmlOptions.ColumnScalingLabel.HelpText=
+23.XhtmlOptions.ColumnScalingLabel.Label=Escalado de columna
+24.XhtmlOptions.ColumnScaling.HelpText=
+25.XhtmlOptions.ColumnScalingPercentLabel.HelpText=
+26.XhtmlOptions.ColumnScalingPercentLabel.Label=%
+27.XhtmlOptions.ConvertToPx.HelpText=
+28.XhtmlOptions.ConvertToPx.Label=Convertir unidades a pixels
+29.XhtmlOptions.OriginalImageSize.HelpText=
+30.XhtmlOptions.OriginalImageSize.Label=Usar tama\u00f1o original de la imagen
+31.XhtmlOptions.SpecialContentLabel.HelpText=
+32.XhtmlOptions.SpecialContentLabel.Label=Contenido especial
+33.XhtmlOptions.Notes.HelpText=
+34.XhtmlOptions.Notes.Label=Exportar notas
+35.XhtmlOptions.UseDublinCore.HelpText=
+36.XhtmlOptions.UseDublinCore.Label=Exportar propiedades del documento (Dublin Core Metadata)
+37.XhtmlOptions.AutoCorrectLabel.HelpText=
+38.XhtmlOptions.AutoCorrectLabel.Label=AutoCorregir
+39.XhtmlOptions.IgnoreHardLineBreaks.HelpText=
+40.XhtmlOptions.IgnoreHardLineBreaks.Label=Ignorar saltos de l\u00ednea
+41.XhtmlOptions.IgnoreEmptyParagraphs.HelpText=
+42.XhtmlOptions.IgnoreEmptyParagraphs.Label=Ignorar p\u00e1rrafos vac\u00edos
+43.XhtmlOptions.IgnoreDoubleSpaces.HelpText=
+44.XhtmlOptions.IgnoreDoubleSpaces.Label=Ignorar dobles espacios
+45.XhtmlOptions.FilesLabel.HelpText=
+46.XhtmlOptions.FilesLabel.Label=Archivos
+47.XhtmlOptions.Split.HelpText=
+48.XhtmlOptions.Split.Label=Separar documento en cabeceras
+49.XhtmlOptions.SplitLevelLabel.HelpText=
+50.XhtmlOptions.SplitLevelLabel.Label=Nivel de cabecera
+51.XhtmlOptions.SplitLevel.HelpText=
+52.SplitLevel.StringItemList=1
+53.SplitLevel.StringItemList=2
+54.SplitLevel.StringItemList=3
+55.SplitLevel.StringItemList=4
+56.SplitLevel.StringItemList=5
+57.SplitLevel.StringItemList=6
+58.XhtmlOptions.RepeatLevelsLabel.HelpText=
+59.XhtmlOptions.RepeatLevelsLabel.Label=Repetir nivel de cabecera
+60.XhtmlOptions.RepeatLevels.HelpText=
+61.RepeatLevels.StringItemList=0
+62.RepeatLevels.StringItemList=1
+63.RepeatLevels.StringItemList=2
+64.RepeatLevels.StringItemList=3
+65.RepeatLevels.StringItemList=4
+66.RepeatLevels.StringItemList=5
+67.XhtmlOptions.SaveImagesInSubdir.HelpText=
+68.XhtmlOptions.SaveImagesInSubdir.Label=Salvar im\u00e1genes en subdirectorio
+69.XhtmlOptions.XsltPathLabel.HelpText=
+70.XhtmlOptions.XsltPathLabel.Label=Direcci\u00F3n XSLT
+71.XhtmlOptions.XsltPath.HelpText=
+72.XhtmlOptions.XsltPath.Text=
+73.XhtmlOptions.ExportButton.HelpText=
+74.XhtmlOptions.ExportButton.Label=Exportar  
+75.XhtmlOptions.CancelButton.HelpText=
+76.XhtmlOptions.CancelButton.Label=Cancelar
+77.XhtmlOptionsCalc.HelpText=
+78.XhtmlOptionsCalc.Title=Opciones para XHTML (Calc2xhtml)
+79.XhtmlOptionsCalc.StyleLabel.HelpText=
+80.XhtmlOptionsCalc.StyleLabel.Label=Estilo
+81.XhtmlOptionsCalc.ConfigLabel.HelpText=
+82.XhtmlOptionsCalc.ConfigLabel.Label=Usar estilo
+83.XhtmlOptionsCalc.Config.HelpText=
+86.XhtmlOptionsCalc.ScalingLabel.HelpText=
+87.XhtmlOptionsCalc.ScalingLabel.Label=Escalado
+88.XhtmlOptionsCalc.Scaling.HelpText=
+89.XhtmlOptionsCalc.ScalingPercentLabel.HelpText=
+90.XhtmlOptionsCalc.ScalingPercentLabel.Label=%
+91.XhtmlOptionsCalc.ColumnScalingLabel.HelpText=
+92.XhtmlOptionsCalc.ColumnScalingLabel.Label=Escalado de columna
+93.XhtmlOptionsCalc.ColumnScaling.HelpText=
+94.XhtmlOptionsCalc.ColumnScalingPercentLabel.HelpText=
+95.XhtmlOptionsCalc.ColumnScalingPercentLabel.Label=%
+96.XhtmlOptionsCalc.ConvertToPx.HelpText=
+97.XhtmlOptionsCalc.ConvertToPx.Label=Convertir unidades a pixels
+98.XhtmlOptionsCalc.OriginalImageSize.HelpText=
+99.XhtmlOptionsCalc.OriginalImageSize.Label=Usar tama\u00f1o original de la imagen
+100.XhtmlOptionsCalc.SpecialContentLabel.HelpText=
+101.XhtmlOptionsCalc.SpecialContentLabel.Label=Contenido especial
+102.XhtmlOptionsCalc.Notes.HelpText=
+103.XhtmlOptionsCalc.Notes.Label=Exportar notas
+104.XhtmlOptionsCalc.UseDublinCore.HelpText=
+105.XhtmlOptionsCalc.UseDublinCore.Label=Exportar propiedades del documento (Dublin Core Metadata)
+106.XhtmlOptionsCalc.SheetsLabel.HelpText=
+107.XhtmlOptionsCalc.SheetsLabel.Label=Hojas
+108.XhtmlOptionsCalc.DisplayHiddenSheets.HelpText=
+109.XhtmlOptionsCalc.DisplayHiddenSheets.Label=Mostrar hojas ocultas
+110.XhtmlOptionsCalc.DisplayHiddenRowsCols.HelpText=
+111.XhtmlOptionsCalc.DisplayHiddenRowsCols.Label=Mostrar filas y columnas ocultas
+112.XhtmlOptionsCalc.DisplayFilteredRowsCols.HelpText=
+113.XhtmlOptionsCalc.DisplayFilteredRowsCols.Label=Mostrar filas y columnas filtradas
+114.XhtmlOptionsCalc.ApplyPrintRanges.HelpText=
+115.XhtmlOptionsCalc.ApplyPrintRanges.Label=Aplicar rangos de impresi\u00f3n
+116.XhtmlOptionsCalc.UseTitleAsHeading.HelpText=
+117.XhtmlOptionsCalc.UseTitleAsHeading.Label=Usar t\u00edtulo como cabecera
+118.XhtmlOptionsCalc.UseSheetNamesAsHeadings.HelpText=
+119.XhtmlOptionsCalc.UseSheetNamesAsHeadings.Label=Usar nombre de las hojas como cabecera
+120.XhtmlOptionsCalc.FilesLabel.HelpText=
+121.XhtmlOptionsCalc.FilesLabel.Label=Archivos
+122.XhtmlOptionsCalc.CalcSplit.HelpText=
+123.XhtmlOptionsCalc.CalcSplit.Label=Salvar hojas en archivos separados
+124.XhtmlOptionsCalc.SaveImagesInSubdir.HelpText=
+125.XhtmlOptionsCalc.SaveImagesInSubdir.Label=Salvar im\u00e1genes en subdirectorio
+126.XhtmlOptionsCalc.ExportButton.HelpText=
+127.XhtmlOptionsCalc.ExportButton.Label=Exportar  
+128.XhtmlOptionsCalc.CancelButton.HelpText=
+129.XhtmlOptionsCalc.CancelButton.Label=Cancelar
+130.Config.StringItemList=Formato original
+131.Config.StringItemList=Chocolate
+132.Config.StringItemList=Medianoche
+133.Config.StringItemList=Modernista
+134.Config.StringItemList=Viejuno
+135.Config.StringItemList=Met\u00e1lico
+136.Config.StringItemList=Suizo
+137.Config.StringItemList=Tradicional
+138.Config.StringItemList=Gambitero
+139.Config.StringItemList=Personalizado
+140.Config.StringItemList=Formato original
+141.Config.StringItemList=Personalizado
diff --git a/source/oxt/writer2xhtml/desc_es.txt b/source/oxt/writer2xhtml/desc_es.txt
new file mode 100644
index 0000000..5326cfe
--- /dev/null
+++ b/source/oxt/writer2xhtml/desc_es.txt
@@ -0,0 +1 @@
+Writer2xhtml contiene filtros de Writer y Calc para exportar a XHTML y XHTML+MathML
\ No newline at end of file
diff --git a/source/oxt/writer2xhtml/description.xml b/source/oxt/writer2xhtml/description.xml
index 61916f0..4a90699 100644
--- a/source/oxt/writer2xhtml/description.xml
+++ b/source/oxt/writer2xhtml/description.xml
@@ -14,6 +14,7 @@
     <name lang="da">Writer2xhtml eksportfiltre</name>
     <name lang="en">Writer2xhtml export filters</name>
     <name lang="de">Writer2xhtml Exportfilter</name>
+    <name lang="es">Writer2xhtml filtros para exportar</name>
     <name lang="fr">Filtres d'exportation Writer2xhtml</name>
     <name lang="ru">Фильтры экспорта Writer2xhtml</name>
     <name lang="uk">Фільтри експорту Writer2xhtml</name>
@@ -23,6 +24,7 @@
     <src xlink:href="description/desc_da.txt" lang="da" />
     <src xlink:href="description/desc_en.txt" lang="en" />
     <src xlink:href="description/desc_de.txt" lang="de" />
+    <src xlink:href="description/desc_es.txt" lang="es" />
     <src xlink:href="description/desc_fr.txt" lang="fr" />
     <src xlink:href="description/desc_ru.txt" lang="ru" />
     <src xlink:href="description/desc_uk.txt" lang="uk" />