Imported Upstream version 3.2.0

[glabels] / help / es / merge-ex2.page

diff --git a/help/es/merge-ex2.page b/help/es/merge-ex2.page
index 1b7fbd5203e7ad9c0ae9ec70c403001c4a6159b3..467d66c62533818d60fec178a7f929b4db7de284 100644 (file)
--- a/help/es/merge-ex2.page
+++ b/help/es/merge-ex2.page
@@ -11,11 +11,23 @@
     </credit>
     <credit type="author">
       <name>Mario Blättermann</name>
-      <email>mariobl@gnome.org</email>
+      <email>mario.blaettermann@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Compartir Igual 3.0</p>
     </license>    
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Daniel Mustieles</mal:name>
+      <mal:email>daniel.mustieles@gmail.com</mal:email>
+      <mal:years>2010-2012</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Jorge González</mal:name>
+      <mal:email>jorgegonz@svn.gnome.org</mal:email>
+      <mal:years>2010</mal:years>
+    </mal:credit>
   </info>
 
     <title>Ejemplo 2: etiquetas de dirección</title>