[gnome-calculator: 3/3] Updated Spanish translation

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

commit ccbf008a018bbdd9e074e09963fb85e5ee595054
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Wed Jan 9 10:15:20 2013 +0100

    Updated Spanish translation

 po/es.po |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index f9edb0e..c68e6c9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,25 +13,16 @@ msgstr ""
 "Project-Id-Version: gcalctool.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=http://";
 "bugzilla.gnome.org/&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-12-03 03:54+0000\n"
-<<<<<<< HEAD
-"PO-Revision-Date: 2012-12-28 13:08+0100\n"
-=======
+"POT-Creation-Date: 2013-01-07 10:44+0000\n"
 "PO-Revision-Date: 2012-12-30 19:33+0100\n"
->>>>>>> eea1f04e3bec90a45b71da4ad1415a406968488e
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: EspaÃol; Castellano <gnome-es-list gnome org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-<<<<<<< HEAD
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-=======
 "X-Generator: Gtranslator 2.91.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
->>>>>>> eea1f04e3bec90a45b71da4ad1415a406968488e
 
 #. Accessible name for the inverse button
 #: ../data/buttons-advanced.ui.h:2 ../data/buttons-programming.ui.h:24
@@ -1207,13 +1198,8 @@ msgstr "ConversiÃn desconocida"
 
 #: ../src/math-equation.vala:900
 #, c-format
-#| msgid "Malformed expression"
 msgid "Malformed expression at token '%s'"
-<<<<<<< HEAD
-msgstr "ExpresiÃn malformada en el elemento Â%sÂ"
-=======
 msgstr "ExpresiÃn mal formada en el valor Â%sÂ"
->>>>>>> eea1f04e3bec90a45b71da4ad1415a406968488e
 
 #. Unknown error.
 #. Error displayed to user when they enter an invalid calculation