diff options
-rw-r--r-- | locale/es/LC_MESSAGES/django.mo | bin | 49819 -> 49819 bytes | |||
-rw-r--r-- | locale/es/LC_MESSAGES/django.po | 199 | ||||
-rw-r--r-- | templates/authopenid/signin.html | 8 | ||||
-rw-r--r-- | urls.py | 1 |
4 files changed, 97 insertions, 111 deletions
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo Binary files differindex eb0ec424..91639ba1 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 6e6321b0..d7655dd7 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-17 15:55+0000\n" +"POT-Creation-Date: 2009-08-17 16:44+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" @@ -24,128 +24,132 @@ msgstr "ingresar/" msgid "upfiles/" msgstr "archivossubidos/" -#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26 +#: urls.py:27 django_authopenid/urls.py:16 +msgid "signup/" +msgstr "registrarse/" + +#: urls.py:28 urls.py:29 urls.py:30 django_authopenid/urls.py:26 #: django_authopenid/urls.py:27 msgid "email/" msgstr "email/" -#: urls.py:27 +#: urls.py:28 msgid "change/" msgstr "cambiar/" -#: urls.py:28 +#: urls.py:29 msgid "sendkey/" msgstr "enviarclave/" -#: urls.py:29 +#: urls.py:30 msgid "verify/" msgstr "verificar/" -#: urls.py:30 +#: urls.py:31 msgid "about/" msgstr "acercadenosotros/" -#: urls.py:31 +#: urls.py:32 msgid "faq/" msgstr "preguntasfrecuentes/" -#: urls.py:32 +#: urls.py:33 msgid "privacy/" msgstr "códigodeprivacidad/" -#: urls.py:33 +#: urls.py:34 msgid "logout/" msgstr "cerrarsesion/" -#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:425 +#: urls.py:35 urls.py:36 urls.py:37 urls.py:49 forum/models.py:425 msgid "answers/" msgstr "respuestas/" -#: urls.py:34 urls.py:46 +#: urls.py:35 urls.py:47 msgid "comments/" msgstr "comentarios/" -#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34 +#: urls.py:36 urls.py:41 urls.py:55 templates/user_info.html:34 msgid "edit/" msgstr "editar/" -#: urls.py:36 urls.py:45 +#: urls.py:37 urls.py:46 msgid "revisions/" msgstr "revisiones/" -#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 -#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19 -#: forum/models.py:313 forum/views.py:1228 forum/views.py:1230 -#: forum/views.py:1470 +#: urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 urls.py:43 +#: urls.py:44 urls.py:45 urls.py:46 urls.py:47 urls.py:48 forum/feed.py:19 +#: forum/models.py:313 forum/views.py:1232 forum/views.py:1234 +#: forum/views.py:1474 msgid "questions/" msgstr "preguntas/" -#: urls.py:38 urls.py:64 +#: urls.py:39 urls.py:65 msgid "ask/" msgstr "preguntar/" -#: urls.py:39 +#: urls.py:40 msgid "unanswered/" msgstr "sinrespuesta/" -#: urls.py:41 +#: urls.py:42 msgid "close/" msgstr "cerrar/" -#: urls.py:42 +#: urls.py:43 msgid "reopen/" msgstr "reabrir/" -#: urls.py:43 +#: urls.py:44 msgid "answer/" msgstr "respuesta/" -#: urls.py:44 +#: urls.py:45 msgid "vote/" msgstr "votar/" -#: urls.py:47 urls.py:48 django_authopenid/urls.py:29 +#: urls.py:48 urls.py:49 django_authopenid/urls.py:29 msgid "delete/" msgstr "borrar/" -#: urls.py:50 +#: urls.py:51 msgid "question/" msgstr "pregunta/" -#: urls.py:51 urls.py:52 forum/views.py:747 forum/views.py:2067 +#: urls.py:52 urls.py:53 forum/views.py:747 forum/views.py:2071 msgid "tags/" msgstr "etiquetas/" -#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:1034 forum/views.py:1038 -#: forum/views.py:1472 forum/views.py:1805 forum/views.py:2069 +#: urls.py:54 urls.py:55 urls.py:56 forum/views.py:1034 forum/views.py:1038 +#: forum/views.py:1476 forum/views.py:1809 forum/views.py:2073 msgid "users/" msgstr "usuarios/" -#: urls.py:56 urls.py:57 +#: urls.py:57 urls.py:58 msgid "badges/" msgstr "distinciones/" -#: urls.py:58 +#: urls.py:59 msgid "messages/" msgstr "mensajes/" -#: urls.py:58 +#: urls.py:59 msgid "markread/" msgstr "marcarleido/" -#: urls.py:60 +#: urls.py:61 msgid "nimda/" msgstr "administrador/" -#: urls.py:62 +#: urls.py:63 msgid "upload/" msgstr "subir/" -#: urls.py:63 urls.py:64 urls.py:65 +#: urls.py:64 urls.py:65 urls.py:66 msgid "books/" msgstr "libros/" -#: urls.py:66 +#: urls.py:67 msgid "search/" msgstr "buscar/" @@ -260,10 +264,6 @@ msgstr "completado/" msgid "register/" msgstr "registrarse/" -#: django_authopenid/urls.py:16 -msgid "signup/" -msgstr "registrarse/" - #: django_authopenid/urls.py:19 msgid "sendpw/" msgstr "enviarcontrasena/" @@ -532,7 +532,7 @@ msgstr "" "por favor use solo los siguientes caracteres en los nombres de etiquetas: " "letras 'a-z', números y caracteres '.-_#'" -#: forum/forms.py:75 templates/index.html:64 templates/question.html:210 +#: forum/forms.py:75 templates/index.html:57 templates/question.html:210 #: templates/question.html.py:396 templates/questions.html:58 #: templates/questions.html.py:70 templates/unanswered.html:48 #: templates/unanswered.html.py:60 @@ -729,22 +729,22 @@ msgstr "perfil - preferencia de " msgid "subscription saved, %(email)s needs validation" msgstr "subscripción guardada, %(email)s necesita validación" -#: forum/views.py:1914 +#: forum/views.py:1918 msgid "uploading images is limited to users with >60 reputation points" msgstr "para subir imagenes debes tener más de 60 puntos de reputación" -#: forum/views.py:1916 +#: forum/views.py:1920 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'" msgstr "" "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', " "'tiff'" -#: forum/views.py:1882 +#: forum/views.py:1922 #, python-format msgid "maximum upload file size is %sK" msgstr "tamaño máximo permitido es archivo %sK" -#: forum/views.py:1920 +#: forum/views.py:1924 #, python-format msgid "" "Error uploading file. Please contact the site administrator. Thank you. %s" @@ -1109,7 +1109,7 @@ msgstr "esta pregunta ha sido seleccionada como favorita" msgid "number of times" msgstr "numero de veces" -#: templates/book.html:105 templates/index.html:55 templates/questions.html:46 +#: templates/book.html:105 templates/index.html:48 templates/questions.html:46 #: templates/unanswered.html:37 templates/users_questions.html:32 msgid "votes" msgstr "votos" @@ -1118,12 +1118,12 @@ msgstr "votos" msgid "the answer has been accepted to be correct" msgstr "la respuesta ha sido aceptada como correcta" -#: templates/book.html:115 templates/index.html:56 templates/questions.html:47 +#: templates/book.html:115 templates/index.html:49 templates/questions.html:47 #: templates/unanswered.html:38 templates/users_questions.html:42 msgid "views" msgstr "vistas" -#: templates/book.html:125 templates/index.html:76 templates/question.html:500 +#: templates/book.html:125 templates/index.html:69 templates/question.html:500 #: templates/questions.html:84 templates/questions.html.py:157 #: templates/tags.html:49 templates/unanswered.html:75 #: templates/unanswered.html.py:106 templates/users_questions.html:54 @@ -1134,7 +1134,7 @@ msgstr "usando etiquetas" msgid "subscribe to book RSS feed" msgstr "suscribirse al RSS del libro" -#: templates/book.html:147 templates/index.html:131 +#: templates/book.html:147 templates/index.html:118 msgid "subscribe to the questions feed" msgstr "suscribirse al agregado de noticias" @@ -1407,17 +1407,16 @@ msgstr "Por favor haz tu pregunta, ¡ayudanos a mejorar nuestra comunidad!" msgid "questions" msgstr "preguntas" -#: templates/faq.html:126 templates/index.html:137 templates/index.html.py:139 +#: templates/faq.html:126 templates/index.html:123 msgid "." msgstr "." -#: templates/footer.html:7 templates/header.html:14 templates/index.html:91 -#: templates/index.html.py:95 +#: templates/footer.html:7 templates/header.html:14 templates/index.html:83 msgid "about" msgstr "acerca de nosotros" -#: templates/footer.html:8 templates/header.html:15 templates/index.html:92 -#: templates/index.html.py:96 templates/question_edit_tips.html:16 +#: templates/footer.html:8 templates/header.html:15 templates/index.html:84 +#: templates/question_edit_tips.html:16 msgid "faq" msgstr "preguntas frecuentes" @@ -1461,7 +1460,7 @@ msgstr "usuarios" msgid "books" msgstr "libros" -#: templates/header.html:36 templates/index.html:137 +#: templates/header.html:36 msgid "unanswered questions" msgstr "sin respuesta" @@ -1485,107 +1484,97 @@ msgstr "Inicio" msgid "Questions" msgstr "Preguntas" -#: templates/index.html:25 templates/index.html.py:30 +#: templates/index.html:24 msgid "last updated questions" msgstr "ultimas preguntas actualizadas" -#: templates/index.html:25 templates/index.html.py:30 -#: templates/questions.html:25 templates/unanswered.html:20 +#: templates/index.html:24 templates/questions.html:25 +#: templates/unanswered.html:20 msgid "newest" msgstr "más nuevas" -#: templates/index.html:26 templates/index.html.py:31 -#: templates/questions.html:27 +#: templates/index.html:25 templates/questions.html:27 msgid "hottest questions" msgstr "preguntas calientes" -#: templates/index.html:26 templates/index.html.py:31 -#: templates/questions.html:27 +#: templates/index.html:25 templates/questions.html:27 msgid "hottest" msgstr "más calientes" -#: templates/index.html:27 templates/index.html.py:32 -#: templates/questions.html:28 +#: templates/index.html:26 templates/questions.html:28 msgid "most voted questions" msgstr "preguntas más votadas" -#: templates/index.html:27 templates/index.html.py:32 -#: templates/questions.html:28 +#: templates/index.html:26 templates/questions.html:28 msgid "most voted" msgstr "más votadas" -#: templates/index.html:28 templates/index.html.py:33 +#: templates/index.html:27 msgid "all questions" msgstr "todas las preguntas" -#: templates/index.html:54 templates/questions.html:45 +#: templates/index.html:47 templates/questions.html:45 #: templates/unanswered.html:36 templates/users_questions.html:37 msgid "answers" msgstr "respuestas" -#: templates/index.html:76 templates/question.html:500 +#: templates/index.html:69 templates/question.html:500 #: templates/questions.html:84 templates/questions.html.py:157 #: templates/tags.html:49 templates/unanswered.html:75 #: templates/unanswered.html.py:106 templates/users_questions.html:54 msgid "see questions tagged" msgstr "ver preguntas etiquetadas" -#: templates/index.html:87 +#: templates/index.html:80 msgid "welcome to website" msgstr "bienvenido a sitio" -#: templates/index.html:102 +#: templates/index.html:89 msgid "Recent tags" msgstr "Etiquetas recientes" -#: templates/index.html:107 templates/question.html:125 +#: templates/index.html:94 templates/question.html:125 #, python-format msgid "see questions tagged '%(tagname)s'" msgstr "ver preguntas etiquetadas '%(tagname)s'" -#: templates/index.html:110 templates/index.html.py:137 -#: templates/index.html:139 +#: templates/index.html:97 templates/index.html.py:123 msgid "popular tags" msgstr "etiquetas populares" -#: templates/index.html:115 +#: templates/index.html:102 msgid "Recent awards" msgstr "Reconocimientos recientes" -#: templates/index.html:121 +#: templates/index.html:108 msgid "given to" msgstr "dados a" -#: templates/index.html:126 +#: templates/index.html:113 msgid "all awards" msgstr "todos los reconocimientos" -#: templates/index.html:131 +#: templates/index.html:118 msgid "subscribe to last 30 questions by RSS" msgstr "suscribirse a las últimas 30 preguntas por RSS" -#: templates/index.html:137 templates/index.html.py:139 +#: templates/index.html:123 msgid "Still looking for more? See" msgstr "¿Aún sigues buscando más? Ver" -#: templates/index.html:137 -#, fuzzy -msgid "complete list of quesionts" +#: templates/index.html:123 +msgid "complete list of questions" msgstr "lista completa de preguntas" -#: templates/index.html:137 templates/index.html.py:139 +#: templates/index.html:123 msgid "or" msgstr "ó" -#: templates/index.html:137 templates/index.html.py:139 +#: templates/index.html:123 msgid "Please help us answer" msgstr "Ayudanos a responder" -#: templates/index.html:139 -msgid "complete list of questions" -msgstr "lista completa de preguntas" - -#: templates/index.html:139 +#: templates/index.html:123 msgid "list of unanswered questions" msgstr "lista de preguntas sin respuesta" @@ -1747,19 +1736,19 @@ msgstr "comentarios" msgid "add comment" msgstr "agregar comentario" -#: templates/question.html:260 +#: templates/question.html:261 msgid "The question has been closed for the following reason" msgstr "La pregunta fue cerrada por el siguiente motivo " -#: templates/question.html:260 +#: templates/question.html:261 msgid "by" msgstr "por" -#: templates/question.html:262 +#: templates/question.html:263 msgid "close date " msgstr "fecha de cierre" -#: templates/question.html:269 templates/user_stats.html:13 +#: templates/question.html:270 templates/user_stats.html:13 msgid "Answers" msgstr "Respuestas" @@ -2447,8 +2436,7 @@ msgstr "contraseña" msgid "Register" msgstr "Registrarse" -#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:140 -#: templates/authopenid/signin.html:144 +#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:139 msgid "Forgot your password?" msgstr "¿Olvidaste tu contraseña?" @@ -2592,8 +2580,7 @@ msgstr "" "Ingresa tu dirección (URL) de <a class=\"openid_logo\" href=\"http://openid." "net\">OpenID</a>" -#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139 -#: templates/authopenid/signin.html:143 +#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:138 msgid "Login" msgstr "Ingresar" @@ -2609,40 +2596,40 @@ msgstr "Nombre de usuario y contraseña" msgid "Login name" msgstr "Nombre de usuario" -#: templates/authopenid/signin.html:141 templates/authopenid/signin.html:145 +#: templates/authopenid/signin.html:140 msgid "Create new account" msgstr "Crear cuenta nueva" -#: templates/authopenid/signin.html:155 +#: templates/authopenid/signin.html:149 msgid "Why use OpenID?" msgstr "¿Porqué usar OpenID?" -#: templates/authopenid/signin.html:158 +#: templates/authopenid/signin.html:152 msgid "with openid it is easier" msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña." -#: templates/authopenid/signin.html:161 +#: templates/authopenid/signin.html:155 msgid "reuse openid" msgstr "" "Puedes de forma segura re-usar el mismo nombre de usuario para todos los " "sitios que acepten OpenID." -#: templates/authopenid/signin.html:164 +#: templates/authopenid/signin.html:158 msgid "openid is widely adopted" msgstr "" "OpenID es extensamente usado. Hay más de 160,000,000 cuentas de OpenID en " "uso en el mundo. Mas de 10,000 sitios aceptan OpenID." -#: templates/authopenid/signin.html:167 +#: templates/authopenid/signin.html:161 msgid "openid is supported open standard" msgstr "" "OpenID es basado en un standard abierto, apoyado por muchas organizaciones." -#: templates/authopenid/signin.html:172 +#: templates/authopenid/signin.html:166 msgid "Find out more" msgstr "Averigua más" -#: templates/authopenid/signin.html:173 +#: templates/authopenid/signin.html:167 msgid "Get OpenID" msgstr "Adquiere una OpenID" @@ -2686,6 +2673,10 @@ msgstr "Registrate con tu OpenID" msgid "Login with your OpenID" msgstr "Ingresar con tu OpenID" +#, fuzzy +#~ msgid "complete list of quesionts" +#~ msgstr "lista completa de preguntas" + #~ msgid "votes total" #~ msgstr "votos totales" diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html index 7c234ff3..f8749d2b 100644 --- a/templates/authopenid/signin.html +++ b/templates/authopenid/signin.html @@ -135,15 +135,9 @@ <legend class="big">{% trans "Use login name and password" %}</legend> <div class="form-row"><label for="id_username">{% trans "Login name" %}:</label><br />{{ form1.username }}</div> <div class="form-row"><label for="id_password">{% trans "Password" %}:</label><br />{{ form1.password }}</div> -<<<<<<< HEAD:templates/authopenid/signin.html <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"> <a href="{%url sendpw%}">{% trans "Forgot your password?" %}</a> - <a href="/registrarse">{% trans "Create new account" %}</a></div> -======= - <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"/> - <a href="">{% trans "Forgot your password?" %}</a> - <a href="">{% trans "Create new account" %}</a></div> ->>>>>>> master:templates/authopenid/signin.html + <a href="{%url user_signup%}">{% trans "Create new account" %}</a></div> </fieldset> </form> </div> @@ -24,6 +24,7 @@ urlpatterns = patterns('', ), (r'^%s' % _('account/'), include('django_authopenid.urls')), (r'^%s/$' % _('signin/'), 'django_authopenid.views.signin'), + (r'^%s$' % _('signup/'), 'django_authopenid.views.signup'), url(r'^%s%s$' % (_('email/'), _('change/')), 'django_authopenid.views.changeemail', name='user_changeemail'), url(r'^%s%s$' % (_('email/'), _('sendkey/')), 'django_authopenid.views.send_email_key'), url(r'^%s%s(?P<id>\d+)/(?P<key>[\dabcdef]{32})/$' % (_('email/'), _('verify/')), 'django_authopenid.views.verifyemail', name='user_verifyemail'), |