[gnome-calculator: 2/3] Fixed syntax in .desktop file

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

commit 2c3780eebb0a853fdf6aa136444efa20f2c3e9a2
Merge: 17cbf3f eea1f04
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Wed Jan 9 10:13:50 2013 +0100

    Fixed syntax in .desktop file

 data/gnome-calculator.desktop.in |    1 +
 help/es/es.po                    |   23 +-
 po/es.po                         |   15 +-
 po/gl.po                         | 1936 ++++++++++++-------------
 po/lt.po                         | 2963 +++++++-------------------------------
 po/nb.po                         | 1449 ++++++-------------
 po/pl.po                         | 1465 ++++++--------------
 po/ru.po                         | 2123 +++++++++++++---------------
 src/equation-parser.vala         |  110 ++-
 src/equation.vala                |    4 +-
 src/gcalccmd.vala                |    4 +-
 src/gnome-calculator.vala        |    4 +-
 src/math-equation.vala           |   29 +-
 src/serializer.vala              |   24 +-
 src/test-equation.vala           |   33 +-
 src/test-serializer.vala         |  102 +-
 src/unit.vala                    |    3 +-
 17 files changed, 3490 insertions(+), 6798 deletions(-)
---
diff --cc data/gnome-calculator.desktop.in
index ee677e7,78cf5cf..aced995
--- a/data/gnome-calculator.desktop.in
+++ b/data/gnome-calculator.desktop.in
@@@ -1,6 -1,7 +1,7 @@@
  [Desktop Entry]
  _Name=Calculator
  _Comment=Perform arithmetic, scientific or financial calculations
 -_Keywords:calculation;arithmetic;scientific;financial;
++_Keywords=calculation;arithmetic;scientific;financial;
  Exec=gnome-calculator
  Icon=accessories-calculator
  Terminal=false
diff --cc po/es.po
index fecf1f7,01209bc..f9edb0e
--- a/po/es.po
+++ b/po/es.po
@@@ -14,15 -14,15 +14,24 @@@ msgstr "
  "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"
++=======
+ "PO-Revision-Date: 2012-12-30 19:33+0100\n"
++>>>>>>> eea1f04e3bec90a45b71da4ad1415a406968488e
  "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
- "Language-Team: EspaÃol <gnome-es-list gnome org>\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
@@@ -1200,7 -1200,7 +1209,11 @@@ msgstr "ConversiÃn desconocida
  #, 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