diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-09 18:44:32 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-09 18:44:32 -0600 |
| commit | 0a9a8414adaab29ff616c94286f84f845b35a36d (patch) | |
| tree | 157532876a5c3be187f4b494655c4167fac5432a /locale/es | |
| parent | 25fe4c589c822e28c48c9afb1f2cbc80f6f7cce6 (diff) | |
| parent | 5d900baf26548c0efec7f3f93c5f67252ed46666 (diff) | |
| download | askbot-0a9a8414adaab29ff616c94286f84f845b35a36d.tar.gz askbot-0a9a8414adaab29ff616c94286f84f845b35a36d.tar.bz2 askbot-0a9a8414adaab29ff616c94286f84f845b35a36d.zip | |
Merge branch 'master' into experimental
Conflicts:
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
Diffstat (limited to 'locale/es')
| -rw-r--r-- | locale/es/LC_MESSAGES/django.mo | bin | 42056 -> 42047 bytes | |||
| -rw-r--r-- | locale/es/LC_MESSAGES/django.po | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo Binary files differindex dec5aa7f..7e69adc9 100644 --- a/locale/es/LC_MESSAGES/django.mo +++ b/locale/es/LC_MESSAGES/django.mo diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index baf7cc6e..9dbbfa0e 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-09 20:15+0000\n" -"PO-Revision-Date: 2009-08-09 14:16-0600\n" +"PO-Revision-Date: 2009-08-09 18:44-0600\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -1292,7 +1292,7 @@ msgstr "mi perfil" #: templates/header.html:42 msgid "ask a question" -msgstr "hacer una pregunta" +msgstr "preguntar" #: templates/header.html:57 msgid "search" |