aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-04 21:08:32 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-04 21:08:32 +0800
commitc3e0648d8b5a1d73f82f0a7691b9ab1320248392 (patch)
tree677c9472380b3119d08f42eb48c001d18bfd6243 /po
parent5395bd3308e25f3ca2ac1b35460ba6df1d294f4b (diff)
parentfb970ccf14e33d92cfb9409d44f7b06355e958fc (diff)
downloadgsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.gz
gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.tar.zst
gsoc2013-evolution-c3e0648d8b5a1d73f82f0a7691b9ab1320248392.zip
Merge branch 'master' into kill-bonobo
Conflicts: addressbook/gui/Makefile.am addressbook/gui/widgets/Makefile.am addressbook/gui/widgets/eab-popup-control.c calendar/gui/e-meeting-time-sel.c calendar/gui/migration.c calendar/modules/e-memo-shell-module-migrate.h e-util/e-logger.c mail/e-mail-attachment-bar.c mail/em-composer-utils.c mail/em-format-html-display.c plugins/mail-account-disable/Makefile.am plugins/select-one-source/Makefile.am po/es.po shell/Makefile.am shell/e-shell-common.h shell/e-shell-nm.c shell/e-shell-window-commands.c shell/e-shell-window.c shell/e-sidebar.c shell/e-user-creatable-items-handler.c shell/importer/Makefile.am shell/test/Makefile.am widgets/misc/test-error.c widgets/misc/test-info-label.c widgets/misc/test-multi-config-dialog.c
Diffstat (limited to 'po')
-rw-r--r--po/es.po4
1 files changed, 2 insertions, 2 deletions
diff --git a/po/es.po b/po/es.po
index 35065213bb..757de8afe2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,7 +17,7 @@ msgstr ""
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=evolution\n"
"POT-Creation-Date: 2009-05-03 04:00+0000\n"
-"PO-Revision-Date: 2009-05-03 11:38+0200\n"
+"PO-Revision-Date: 2009-05-03 19:02+0200\n"
"Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"MIME-Version: 1.0\n"
@@ -11591,7 +11591,7 @@ msgstr "Ocultar _sin formato"
#: ../mail/em-format-html-display.c:2180
msgid "O_pen With"
-msgstr "Abrir _con"
+msgstr "Abrir c_on"
#: ../mail/em-format-html-display.c:2257
msgid ""