summaryrefslogtreecommitdiffstats
path: root/locale/es/LC_MESSAGES
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-12 11:03:14 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-12 11:03:14 -0600
commit9fe24a4e31292c434ddcc56a1a0cc0f17b100bb3 (patch)
tree8622dc0313e6cdb9e2903b96f5fa5a6b27912902 /locale/es/LC_MESSAGES
parent9e70d5be2571f7671c06c6960c04fff414b4d87c (diff)
parentdc48a3197434baac279fa438c7a399b210723715 (diff)
downloadaskbot-9fe24a4e31292c434ddcc56a1a0cc0f17b100bb3.tar.gz
askbot-9fe24a4e31292c434ddcc56a1a0cc0f17b100bb3.tar.bz2
askbot-9fe24a4e31292c434ddcc56a1a0cc0f17b100bb3.zip
Merge branch 'master' into experimental
Conflicts: locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po
Diffstat (limited to 'locale/es/LC_MESSAGES')
-rw-r--r--locale/es/LC_MESSAGES/django.mobin42047 -> 42479 bytes
-rw-r--r--locale/es/LC_MESSAGES/django.po4
2 files changed, 2 insertions, 2 deletions
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 7e69adc9..1c668ffc 100644
--- a/locale/es/LC_MESSAGES/django.mo
+++ b/locale/es/LC_MESSAGES/django.mo
Binary files differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index c3eda324..a79b08f6 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: 2009-08-12 10:39-0600\n"
+"PO-Revision-Date: 2009-08-12 11:03-0600\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -1638,7 +1638,7 @@ msgstr "Responde la pregunta"
#: templates/question.html:468
msgid "Notify me daily if there are any new answers."
-msgstr "Notifiquema diariamente si hay nuevas respuestas"
+msgstr "Notificarme diariamente si hay nuevas respuestas"
#: templates/question.html:470
msgid "once you sign in you will be able to subscribe for any updates here"