diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-17 10:02:15 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-17 10:05:23 -0600 |
| commit | aba6338c8d37bea03b23f7013766bc32c5cfa278 (patch) | |
| tree | 95aa73f2ca48c253ce6b34578b129104cf1b8bc0 /locale/es/LC_MESSAGES | |
| parent | 50241d14814f63cd8c57d69d5fba8bcfc3409f28 (diff) | |
| parent | 5f2a6a9693292e0828a591a6d9a8ad5c7e637c84 (diff) | |
| download | askbot-aba6338c8d37bea03b23f7013766bc32c5cfa278.tar.gz askbot-aba6338c8d37bea03b23f7013766bc32c5cfa278.tar.bz2 askbot-aba6338c8d37bea03b23f7013766bc32c5cfa278.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.mo | bin | 49900 -> 49819 bytes | |||
| -rw-r--r-- | locale/es/LC_MESSAGES/django.po | 30 |
2 files changed, 14 insertions, 16 deletions
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo Binary files differindex 77746600..eb0ec424 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 3d9e8297..6e6321b0 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-16 23:31+0000\n" -"PO-Revision-Date: 2009-08-16 17:32-0600\n" +"POT-Creation-Date: 2009-08-17 15:55+0000\n" +"PO-Revision-Date: 2009-08-17 10:04-0600\n" "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -739,7 +739,7 @@ msgstr "" "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', " "'tiff'" -#: forum/views.py:1918 +#: forum/views.py:1882 #, python-format msgid "maximum upload file size is %sK" msgstr "tamaño máximo permitido es archivo %sK" @@ -1747,21 +1747,19 @@ msgstr "comentarios" msgid "add comment" msgstr "agregar comentario" -#: templates/question.html:261 -#, python-format -msgid "" -"The question has been closed for the following reason \"%(question." -"get_close_reason_display)s\" by" -msgstr "" -"La pregunta ha sido cerrada por el siguiente motivo \"%(question." -"get_close_reason_display)s\" por" +#: templates/question.html:260 +msgid "The question has been closed for the following reason" +msgstr "La pregunta fue cerrada por el siguiente motivo " -#: templates/question.html:263 -#, python-format -msgid "close date %(question.closed_at)s" -msgstr "fecha de cerrada %(question.closed_at)s" +#: templates/question.html:260 +msgid "by" +msgstr "por" + +#: templates/question.html:262 +msgid "close date " +msgstr "fecha de cierre" -#: templates/question.html:270 templates/user_stats.html:13 +#: templates/question.html:269 templates/user_stats.html:13 msgid "Answers" msgstr "Respuestas" |