[meld] Updated Spanish translation

[Daniel Mustieles García <dmustieles src gnome org>]

commit ee7a5b5591d283d403b589004d8e74e119352764
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Tue May 14 16:02:32 2013 +0200

    Updated Spanish translation

 po/es.po |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index ba476d5..f1db8af 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: meld.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=meld&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-05-08 20:33+0000\n"
-"PO-Revision-Date: 2013-05-13 12:37+0200\n"
+"POT-Creation-Date: 2013-05-13 20:36+0000\n"
+"PO-Revision-Date: 2013-05-14 14:28+0200\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: Español <gnome-es-list gnome org>\n"
 "Language: \n"
@@ -725,12 +725,10 @@ msgid "Create a patch using differences between files"
 msgstr "Crear un parche usando las diferencias entre los archivos"
 
 #: ../meld/filediff.py:224
-#| msgid "Save As..."
 msgid "Save A_ll"
 msgstr "Guardar _todo"
 
 #: ../meld/filediff.py:225
-#| msgid "Start a version control comparison"
 msgid "Save all files in the current comparison"
 msgstr "Guardar todos los archivos en la comparación actual"
 
@@ -843,7 +841,6 @@ msgid "Delete change"
 msgstr "Eliminar el cambio"
 
 #: ../meld/filediff.py:274
-#| msgid "Merge from Left"
 msgid "Merge All from Left"
 msgstr "Mezclar desde la izquierda"
 
@@ -852,7 +849,6 @@ msgid "Merge all non-conflicting changes from the left"
 msgstr "Mezclar todos los cambios sin conflicto de la izquierda"
 
 #: ../meld/filediff.py:277
-#| msgid "Merge from Right"
 msgid "Merge All from Right"
 msgstr "Mezclar desde la derecha"
 
@@ -1342,12 +1338,10 @@ msgid "About this program"
 msgstr "Acerca de este programa"
 
 #: ../meld/meldwindow.py:157
-#| msgid "Full Screen"
 msgid "Fullscreen"
 msgstr "Pantalla completa"
 
 #: ../meld/meldwindow.py:158
-#| msgid "View the comparison in full screen"
 msgid "View the comparison in fullscreen"
 msgstr "Ver la comparación a pantalla completa"
 
@@ -1506,7 +1500,6 @@ msgid "Remove from version control"
 msgstr "Quitar del control de versiones"
 
 #: ../meld/vcview.py:237
-#| msgid "_Resolved"
 msgid "Mar_k as Resolved"
 msgstr "Mar_car como resuelto"
 
@@ -1748,16 +1741,20 @@ msgstr ""
 
 #: ../meld/vc/git.py:108
 #, python-format
-msgid "Unpushed commits found: %d in %d branch"
-msgid_plural "Unpushed commits found: %d in %d branches"
-msgstr[0] "Encontrados cambios sin empujar: %d en %d rama"
-msgstr[1] "Encontrados cambios sin empujar: %d en %d ramas"
+#| msgid "Unpushed commits found: %d in %d branch"
+#| msgid_plural "Unpushed commits found: %d in %d branches"
+msgid "%d unpushed commits in %d branches"
+msgstr "%d cambios sin empujar en %d ramas"
 
-#: ../meld/vc/git.py:112
-msgid "No unpushed commits found"
-msgstr "No se han encontrado cambios sin empujar"
+#: ../meld/vc/git.py:111
+#, python-format
+#| msgid "No unpushed commits found"
+msgid "%d unpushed commit"
+msgid_plural "%d unpushed commits"
+msgstr[0] "%d cambio sin empujar"
+msgstr[1] "%d cambios sin empujar"
 
-#: ../meld/vc/git.py:308
+#: ../meld/vc/git.py:310
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Modo cambiado de %s a %s"