diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-12 09:16:42 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-12 09:16:42 -0600 |
| commit | c96c664789084179e54c369406b5dfcbeadab141 (patch) | |
| tree | 4a686a56d8df0e6aac1102a5038eeb8c30ba901e /locale/es | |
| parent | bf85bd2b1fd05126010b9384edcb086303bbeddf (diff) | |
| parent | cc378999abd39e070dbc87b482f022201a86b7fa (diff) | |
| download | askbot-c96c664789084179e54c369406b5dfcbeadab141.tar.gz askbot-c96c664789084179e54c369406b5dfcbeadab141.tar.bz2 askbot-c96c664789084179e54c369406b5dfcbeadab141.zip | |
Merge branch 'master' into experimental
Conflicts:
locale/es/LC_MESSAGES/django.po
templates/authopenid/sendpw.html
templates/authopenid/signin.html
templates/header.html
templates/index.html
templates/question_edit.html
Diffstat (limited to 'locale/es')
| -rw-r--r-- | locale/es/LC_MESSAGES/django.po | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 9dbbfa0e..d8615b89 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" 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 18:44-0600\n" +"POT-Creation-Date: 2009-08-05 22:28-0400\n" +"PO-Revision-Date: 2009-08-07 11:21-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 "preguntar" +msgstr "hacer una pregunta" #: templates/header.html:57 msgid "search" |