From 8bb6c81dbffeadf78857886c487e77eb7bea4f76 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Fri, 7 Aug 2009 13:20:30 -0300 Subject: Spanish translation. --- locale/es/LC_MESSAGES/django.mo | Bin 367 -> 0 bytes locale/es/LC_MESSAGES/django.po | 1054 ++++++++++++++++++++++----------------- 2 files changed, 595 insertions(+), 459 deletions(-) delete mode 100644 locale/es/LC_MESSAGES/django.mo diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo deleted file mode 100644 index 8c359972..00000000 Binary files a/locale/es/LC_MESSAGES/django.mo and /dev/null differ diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 93cfdfe4..0136ea6f 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-28 15:57+0000\n" +"POT-Creation-Date: 2009-08-06 19:54-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,118 +18,126 @@ msgstr "" #: settings.py:12 msgid "account/" -msgstr "" +msgstr "cuenta/" #: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:11 msgid "signin/" -msgstr "" +msgstr "ingresar/" #: django_authopenid/forms.py:67 django_authopenid/views.py:93 msgid "i-names are not supported" -msgstr "" +msgstr "i-names no son soportados" #: django_authopenid/forms.py:102 django_authopenid/forms.py:207 msgid "" "Usernames can only contain letters, numbers and " "underscores" msgstr "" +"Los nombres de usuario solo pueden contener letras, números y guión bajo" #: django_authopenid/forms.py:109 msgid "" "This username does not exist in our database. Please " "choose another." msgstr "" +"Este nombre de usuario no existe en nuestra base de datos. Por favor elija " +"otro." #: django_authopenid/forms.py:126 django_authopenid/forms.py:231 msgid "" "Please enter a valid username and password. Note that " "both fields are case-sensitive." msgstr "" +"Por favor ingrese un usuario y contraseña validos. Ambos campos son " +"sensibles a mayúsculas y minúsculas." #: django_authopenid/forms.py:130 django_authopenid/forms.py:235 msgid "This account is inactive." -msgstr "" +msgstr "Esta cuenta esta inactiva." #: django_authopenid/forms.py:158 msgid "invalid user name" -msgstr "" +msgstr "nombre de usuario no valido" #: django_authopenid/forms.py:160 msgid "sorry, this name can not be used, please try another" msgstr "" +"perdón, pero este nombre de usuario no puede ser usado, intente con otro" #: django_authopenid/forms.py:162 msgid "username too short" -msgstr "" +msgstr "nombre de usuario muy corto" #: django_authopenid/forms.py:170 django_authopenid/forms.py:171 msgid "this name is already in use - please try anoter" -msgstr "" +msgstr "este nombre ya está tomado - por favor intente con otro" #: django_authopenid/forms.py:184 msgid "" "This email is already registered in our database. Please " "choose another." msgstr "" +"Este email ya está registrado en nuestra base de datos. Por favor, intente " +"con otro." #: django_authopenid/forms.py:214 msgid "" "This username don't exist. Please choose another." -msgstr "" +msgstr "Este nombre de usuario no existe, por favor ingrese otro." #: django_authopenid/forms.py:253 msgid "choose a username" -msgstr "" +msgstr "elija un nombre de usuario" #: django_authopenid/forms.py:255 templates/authopenid/signup.html:36 msgid "your email address" -msgstr "" +msgstr "su email (correo electrónico)" #: django_authopenid/forms.py:257 templates/authopenid/signup.html:37 msgid "choose password" -msgstr "" +msgstr "elija una contraseña" #: django_authopenid/forms.py:259 templates/authopenid/signup.html:38 msgid "retype password" -msgstr "" +msgstr "re-ingrese la contraseña" #: django_authopenid/forms.py:330 msgid "" "Old password is incorrect. Please enter the correct " "password." -msgstr "" +msgstr "La antigua contraseña es incorrecta. Por favor ingrese la correcta" #: django_authopenid/forms.py:342 msgid "new passwords do not match" -msgstr "" +msgstr "la nueva contraseña no coincide" #: django_authopenid/forms.py:434 msgid "Incorrect username." -msgstr "" +msgstr "Nombre de usuario incorrecto" #: django_authopenid/urls.py:10 msgid "signout/" -msgstr "" +msgstr "salir/" #: django_authopenid/urls.py:11 msgid "complete/" -msgstr "" +msgstr "completado/" #: django_authopenid/urls.py:13 msgid "register/" -msgstr "" +msgstr "registrarse/" #: django_authopenid/urls.py:14 msgid "signup/" -msgstr "" +msgstr "registrarse/" #: django_authopenid/urls.py:16 msgid "sendpw/" -msgstr "" +msgstr "enviarcontrasena/" #: django_authopenid/urls.py:26 msgid "delete/" -msgstr "" +msgstr "borrar/" #: django_authopenid/views.py:99 #, python-format @@ -138,50 +146,50 @@ msgstr "" #: django_authopenid/views.py:366 msgid "Welcome" -msgstr "" +msgstr "Bienvenido" #: django_authopenid/views.py:456 msgid "Password changed." -msgstr "" +msgstr "Contraseña modificada" #: django_authopenid/views.py:488 msgid "Email changed." -msgstr "" +msgstr "Email modificado." #: django_authopenid/views.py:519 django_authopenid/views.py:671 #, python-format msgid "No OpenID %s found associated in our database" -msgstr "" +msgstr "La OpenID %s no esta asociada en nuestra base de datos" #: django_authopenid/views.py:523 django_authopenid/views.py:678 #, python-format msgid "The OpenID %s isn't associated to current user logged in" -msgstr "" +msgstr "La OpenID %s no esta asociada al usuario actualmente autenticado" #: django_authopenid/views.py:531 msgid "Email Changed." -msgstr "" +msgstr "Email modificado" #: django_authopenid/views.py:606 msgid "This OpenID is already associated with another account." -msgstr "" +msgstr "Esta OpenID ya está asociada a otra cuenta." #: django_authopenid/views.py:611 #, python-format msgid "OpenID %s is now associated with your account." -msgstr "" +msgstr "La OpenID %s está ahora asociada con tu cuenta." #: django_authopenid/views.py:681 msgid "Account deleted." -msgstr "" +msgstr "Cuenta borrada." #: django_authopenid/views.py:721 msgid "Request for new password" -msgstr "" +msgstr "Pedir nueva contraseña" #: django_authopenid/views.py:734 msgid "A new password has been sent to your email address." -msgstr "" +msgstr "Una nueva contraseña ha sido enviada a tu cuenta de Email." #: django_authopenid/views.py:764 #, python-format @@ -189,542 +197,631 @@ msgid "" "Could not change password. Confirmation key '%s' is not " "registered." msgstr "" +"No se ha podido modificar la contraseña. La clave de confirmación '%s' no " +"está registrada" #: django_authopenid/views.py:773 msgid "" "Can not change password. User don't exist anymore in our " "database." msgstr "" +"No se puede cambiar la contraseña. El usuario no existe más en nuestra base " +"de datos." #: django_authopenid/views.py:782 #, python-format msgid "Password changed for %s. You may now sign in." -msgstr "" +msgstr "Contraseña cambiada por %s. Ahora puedes ingresar." #: forum/const.py:8 msgid "duplicate question" -msgstr "" +msgstr "pregunta duplicada" #: forum/const.py:9 msgid "question if off-topic or not relevant" -msgstr "" +msgstr "pregunta esta fuera de tema o no es relevante" #: forum/const.py:10 msgid "too subjective and argumentative" -msgstr "" +msgstr "demasiado subjetiva o argumentativa" #: forum/const.py:11 msgid "is not an answer to the question" -msgstr "" +msgstr "no es una respuesta a la pregunta" #: forum/const.py:12 msgid "the question is answered, right answer was accepted" -msgstr "" +msgstr "la pregunta esta respondida, se ha aceptado la respuesta correcta" #: forum/const.py:13 msgid "problem is not reproducible or outdated" -msgstr "" +msgstr "el problema no es reproducible o caducó" #: forum/const.py:15 msgid "question contains offensive inappropriate, or malicious remarks" -msgstr "" +msgstr "la pregunta contiene frases ofensivas, inapropiadas o maliciosas." #: forum/const.py:16 msgid "spam or advertising" -msgstr "" +msgstr "spam o publicidad" #: forum/const.py:56 msgid "question" -msgstr "" +msgstr "pregunta" #: forum/const.py:57 templates/book.html:110 msgid "answer" -msgstr "" +msgstr "resputa" #: forum/const.py:58 msgid "commented question" -msgstr "" +msgstr "pregunta comentada" #: forum/const.py:59 msgid "commented answer" -msgstr "" +msgstr "respuesta comentada" #: forum/const.py:60 msgid "edited question" -msgstr "" +msgstr "pregunta editada" #: forum/const.py:61 msgid "edited answer" -msgstr "" +msgstr "respuesta editada" #: forum/const.py:62 msgid "received award" -msgstr "" +msgstr "premio recibido" #: forum/const.py:63 msgid "marked best answer" -msgstr "" +msgstr "marcada como mejor respuesta" #: forum/const.py:64 msgid "upvoted" -msgstr "" +msgstr "votada positivo" #: forum/const.py:65 msgid "downvoted" -msgstr "" +msgstr "votada negativo" #: forum/const.py:66 msgid "canceled vote" -msgstr "" +msgstr "voto cancelado" #: forum/const.py:67 msgid "deleted question" -msgstr "" +msgstr "pregunta borrada" #: forum/const.py:68 msgid "deleted answer" -msgstr "" +msgstr "respuesta borrada" #: forum/const.py:69 msgid "marked offensive" -msgstr "" +msgstr "marcada como ofensiva" #: forum/const.py:70 msgid "updated tags" -msgstr "" +msgstr "etiquetas actualizadas" #: forum/const.py:71 msgid "selected favorite" -msgstr "" +msgstr "seleccionada como favorita" #: forum/const.py:72 msgid "completed user profile" -msgstr "" +msgstr "completó perfil de usuario" #: forum/const.py:83 msgid "[closed]" -msgstr "" +msgstr "[cerrada]" #: forum/const.py:84 msgid "[deleted]" -msgstr "" +msgstr "[borrada]" #: forum/const.py:85 msgid "initial version" -msgstr "" +msgstr "versión inicial" #: forum/const.py:86 msgid "retagged" -msgstr "" +msgstr "re-etiquetada" #: forum/feed.py:17 msgid "site title" -msgstr "" +msgstr "titulo del sitio" #: forum/feed.py:17 msgid " - " -msgstr "" +msgstr " - " #: forum/feed.py:17 msgid "site slogan" -msgstr "" +msgstr " slogan del sitio" #: forum/feed.py:17 msgid "latest questions" -msgstr "" +msgstr "últimas preguntas" #: forum/feed.py:20 msgid "meta site content" -msgstr "" +msgstr "meta descripción" #: forum/feed.py:22 msgid "copyright message" -msgstr "" +msgstr "mensaje de copyright" -#: forum/forms.py:14 templates/question_edit_tips.html:31 +#: forum/forms.py:14 templates/answer_edit_tips.html:34 +#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:31 #: templates/question_edit_tips.html:36 msgid "title" -msgstr "" +msgstr "titulo" #: forum/forms.py:15 msgid "please enter a descriptive title for your question" -msgstr "" +msgstr "ingrese un titulo descriptivo para su pregunta" #: forum/forms.py:20 msgid "title must be > 10 characters" -msgstr "" +msgstr "el titulo debe tener al menos 10 caracteres" #: forum/forms.py:29 msgid "content" -msgstr "" +msgstr "contenido" #: forum/forms.py:35 msgid "question content must be > 10 characters" -msgstr "" +msgstr "el contenido de la pregunta debe ser al menos de 10 caracteres" #: forum/forms.py:45 templates/header.html:30 templates/header.html.py:61 msgid "tags" -msgstr "" +msgstr "etiquetas" #: forum/forms.py:46 msgid "please use space to separate tags (this enables autocomplete feature)" msgstr "" +"por favor utilice espacio para separar las etiquetas (esto habilitael auto-" +"completado)" #: forum/forms.py:53 msgid "tags are required" -msgstr "" +msgstr "las etiquetas son requeridas" #: forum/forms.py:57 msgid "please use 5 tags or less" -msgstr "" +msgstr "por favor use 5 o menos etiquetas" #: forum/forms.py:60 msgid "tags must be shorter than 20 characters" -msgstr "" +msgstr "las etiquetas deben ser menores a 20 caracteres" #: forum/forms.py:64 msgid "" "please use following characters in tags: letters 'a-z', numbers, and " "characters '.-_#'" msgstr "" +"por favor use solo los siguientes caracteres en los nombres de etiquetas: " +"letras 'a-z', números y caracteres '.-_#'" #: forum/forms.py:74 templates/index.html:56 templates/question.html:196 #: templates/question.html.py:377 templates/unanswered.html:48 #: templates/unanswered.html.py:60 +#, fuzzy msgid "community wiki" -msgstr "" +msgstr "wiki de comunidad" #: forum/forms.py:75 msgid "" "if you choose community wiki option, the question and answer do not generate " "points and name of author will not be shown" msgstr "" +"si marca la opción 'wiki de comunidad', la pregunta y respuestas no generan " +"puntos y el nombre del autor no será mostrado" #: forum/forms.py:84 msgid "update summary:" -msgstr "" +msgstr "resumen de modificación" #: forum/forms.py:85 msgid "" "enter a brief summary of your revision (e.g. fixed spelling, grammar, " "improved style, this field is optional)" msgstr "" +"ingresa un breve resumen de tu revisión (ej. error ortográfico, gramática, " +"mejoras de estilo. Este campo es opcional." #: forum/forms.py:160 msgid "this email does not have to be linked to gravatar" -msgstr "" +msgstr "este email no tiene porque estar asociado a un Gravatar" #: forum/forms.py:161 msgid "Real name" -msgstr "" +msgstr "Nombre real" #: forum/forms.py:162 msgid "Website" -msgstr "" +msgstr "Sitio Web" #: forum/forms.py:163 msgid "Location" -msgstr "" +msgstr "Ubicación" #: forum/forms.py:164 msgid "Date of birth" -msgstr "" +msgstr "Fecha de nacimiento" #: forum/forms.py:164 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD" -msgstr "" +msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD" #: forum/forms.py:165 templates/authopenid/settings.html:20 msgid "Profile" -msgstr "" +msgstr "Perfil" #: forum/forms.py:190 forum/forms.py:191 msgid "this email has already been registered, please use another one" -msgstr "" +msgstr "este email ya ha sido registrado, por favor use otro" #: forum/models.py:316 templates/badges.html:50 msgid "gold" -msgstr "" +msgstr "oro" #: forum/models.py:317 templates/badges.html:58 msgid "silver" -msgstr "" +msgstr "plata" #: forum/models.py:318 templates/badges.html:65 msgid "bronze" -msgstr "" +msgstr "bronze" #: forum/user.py:17 templates/user_tabs.html:7 +#, fuzzy msgid "overview" -msgstr "" +msgstr "vista general" #: forum/user.py:18 msgid "user profile" -msgstr "" +msgstr "perfil de usuario" #: forum/user.py:19 msgid "user profile overview" -msgstr "" +msgstr "vista general del perfil de usuario" #: forum/user.py:25 templates/user_tabs.html:9 +#, fuzzy msgid "recent activity" -msgstr "" +msgstr "actividades recientes" #: forum/user.py:26 msgid "recent user activity" -msgstr "" +msgstr "actividades recientes del usuario" #: forum/user.py:27 msgid "profile - recent activity" -msgstr "" +msgstr "perfil - actividades recientes" #: forum/user.py:34 templates/user_tabs.html:13 +#, fuzzy msgid "responses" -msgstr "" +msgstr "respuestas" #: forum/user.py:35 templates/user_tabs.html:12 msgid "comments and answers to others questions" -msgstr "" +msgstr "comentarios y respuestas a preguntas de otros" #: forum/user.py:36 msgid "profile - responses" -msgstr "" +msgstr "perfil - respuestas" #: forum/user.py:43 templates/user_info.html:23 templates/users.html:25 +#, fuzzy msgid "reputation" -msgstr "" +msgstr "reputación" #: forum/user.py:44 msgid "user reputation in the community" -msgstr "" +msgstr "reputación del usuario en la comunidad" #: forum/user.py:45 msgid "profile - user reputation" -msgstr "" +msgstr "perfil - reputación del usuario" #: forum/user.py:51 msgid "favorite questions" -msgstr "" +msgstr "preguntas favoritas" #: forum/user.py:52 +#, fuzzy msgid "users favorite questions" -msgstr "" +msgstr "preguntas favoritas de los usuarios" #: forum/user.py:53 msgid "profile - favorite questions" -msgstr "" +msgstr "perfil - preguntas favoritas" #: forum/user.py:60 templates/user_tabs.html:20 msgid "casted votes" -msgstr "" +msgstr "votos" #: forum/user.py:61 templates/user_tabs.html:20 msgid "user vote record" -msgstr "" +msgstr "historial de votación" #: forum/user.py:62 msgid "profile - votes" -msgstr "" +msgstr "perfil - votos" #: forum/user.py:69 +#, fuzzy msgid "preferences" -msgstr "" +msgstr "preferencias" #: forum/user.py:70 templates/user_tabs.html:28 msgid "user preference settings" -msgstr "" +msgstr "preferencias del usuario" #: forum/user.py:71 msgid "profile - user preferences" -msgstr "" +msgstr "perfil - preferencia de " #: forum/views.py:1726 msgid "uploading images is limited to users with >60 reputation points" -msgstr "" +msgstr "para subir imagenes debes tener más de 60 puntos de reputación" #: forum/views.py:1728 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:1730 #, python-format msgid "maximum upload file size is %sK" -msgstr "" +msgstr "tamaño máximo permitido es archivo %sK" #: forum/views.py:1732 #, python-format msgid "" "Error uploading file. Please contact the site administrator. Thank you. %s" msgstr "" +"Error al subir el archivo. Por favor, contacte al administrador. Gracias. %s" #: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168 #: templates/header.html:33 msgid "badges" -msgstr "" +msgstr "distinciones" #: forum/templatetags/extra_tags.py:140 forum/templatetags/extra_tags.py:167 msgid "reputation points" -msgstr "" +msgstr "puntos de reputación" #: forum/templatetags/extra_tags.py:221 msgid " ago" -msgstr "" +msgstr " atras" #: templates/404.html:24 msgid "Sorry, could not find the page you requested." -msgstr "" +msgstr "Disculpe, no se pudo encontrar la página que solicito." #: templates/404.html:26 msgid "This might have happened for the following reasons:" -msgstr "" +msgstr "Esto puede haber sucedido por alguno de los siguientes motivos:" #: templates/404.html:28 msgid "this question or answer has been deleted;" -msgstr "" +msgstr "esta pregunta o respuesta ha sido borrada;" #: templates/404.html:29 msgid "url has error - please check it;" -msgstr "" +msgstr "la url tiene un error - por favor compruebelo;" #: templates/404.html:30 msgid "" "the page you tried to visit is protected or you don't have sufficient " "points, see" msgstr "" +"La pagina que intentas acceder esta protegida o no tienes los puntos de " +"reputación suficientes, ver" #: templates/404.html:31 msgid "if you believe this error 404 should not have occured, please" -msgstr "" +msgstr "si consideras que este error 404 no debería haber sucedido, por favor" #: templates/404.html:32 msgid "report this problem" -msgstr "" +msgstr "reporta este problema" #: templates/404.html:41 templates/500.html:27 msgid "back to previous page" -msgstr "" +msgstr "volver a la página siguiente" #: templates/404.html:42 msgid "see all questions" -msgstr "" +msgstr "ver todas las preguntas" #: templates/404.html:43 msgid "see all tags" -msgstr "" +msgstr "ver todas las tags" #: templates/500.html:24 msgid "system error log is recorded, error will be fixed as soon as possible" msgstr "" +"el error del sistema ha sido registrado, y será solucionado lo antes postible" #: templates/500.html:25 msgid "please report the error to the site administrators if you wish" -msgstr "" +msgstr "por favor reportar el error al administrador de ser posible" #: templates/500.html:28 msgid "see latest questions" -msgstr "" +msgstr "ver ultimas preguntas" #: templates/500.html:29 msgid "see tags" -msgstr "" +msgstr "ver tags" #: templates/answer_edit.html:4 templates/answer_edit.html.py:47 msgid "Edit answer" -msgstr "" +msgstr "Editar respuesta" #: templates/answer_edit.html:24 templates/answer_edit.html.py:27 #: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:37 #: templates/question.html.py:40 templates/question_edit.html:27 msgid "hide preview" -msgstr "" +msgstr "ocultar previsualización" #: templates/answer_edit.html:27 templates/ask.html:28 #: templates/question.html:40 templates/question_edit.html:27 msgid "show preview" -msgstr "" +msgstr "ver previsualización" #: templates/answer_edit.html:47 templates/question_edit.html:65 #: templates/revisions_answer.html:36 templates/revisions_question.html:36 +#, fuzzy msgid "back" -msgstr "" +msgstr "volver" #: templates/answer_edit.html:52 templates/question_edit.html:70 #: templates/revisions_answer.html:47 templates/revisions_question.html:47 msgid "revision" -msgstr "" +msgstr "revisión" #: templates/answer_edit.html:55 templates/question_edit.html:74 msgid "select revision" -msgstr "" +msgstr "seleccionar revisión" #: templates/answer_edit.html:62 templates/ask.html:81 #: templates/question.html:447 templates/question_edit.html:91 msgid "Toggle the real time Markdown editor preview" -msgstr "" +msgstr "Activar la visualización en tiempo real de Markdown" #: templates/answer_edit.html:62 templates/ask.html:81 #: templates/question.html:447 templates/question_edit.html:91 msgid "toggle preview" -msgstr "" +msgstr "Activar previsualización" #: templates/answer_edit.html:73 templates/question_edit.html:119 msgid "Save edit" -msgstr "" +msgstr "Guardar la edición" #: templates/answer_edit.html:74 templates/close.html:29 #: templates/question_edit.html:120 templates/reopen.html:30 #: templates/user_edit.html:83 msgid "Cancel" -msgstr "" +msgstr "Cancelar" + +#: templates/answer_edit_tips.html:4 +msgid "answer tips" +msgstr "sugerencias sobre respuestas" + +#: templates/answer_edit_tips.html:7 +msgid "please make your answer relevant to this community" +msgstr "por favor, haz que tu respuesta sea relevante a esta comunidad" + +#: templates/answer_edit_tips.html:10 +msgid "try to give an answer, rather than engage into a discussion" +msgstr "intenta dar una respuesta, más que entablar un debate o discusión" + +#: templates/answer_edit_tips.html:13 +msgid "please try to provide details" +msgstr "por favor, intenta brindar detalles" + +#: templates/answer_edit_tips.html:16 templates/question_edit_tips.html:13 +msgid "be clear and concise" +msgstr "ser claro y conciso" + +#: templates/answer_edit_tips.html:19 templates/question_edit_tips.html:16 +#, fuzzy +msgid "see frequently asked questions" +msgstr "ver preguntas frecuentes" + +#: templates/answer_edit_tips.html:25 templates/question_edit_tips.html:22 +msgid "Markdown tips" +msgstr "sugerencias de Markdown" + +#: templates/answer_edit_tips.html:28 templates/question_edit_tips.html:25 +msgid "*italic* or __italic__" +msgstr "*itálica* o __itálica__" + +#: templates/answer_edit_tips.html:31 templates/question_edit_tips.html:28 +msgid "**bold** or __bold__" +msgstr "**negrita** o __negrita__" + +#: templates/answer_edit_tips.html:34 templates/question_edit_tips.html:31 +msgid "link" +msgstr "enlace" + +#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:39 +#: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36 +msgid "text" +msgstr "texto" + +#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:36 +msgid "image" +msgstr "imagen" + +#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:40 +msgid "numbered list:" +msgstr "lista numerada" + +#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:45 +msgid "basic HTML tags are also supported" +msgstr "etiquetas básicas de HTML permitidas" + +#: templates/answer_edit_tips.html:51 templates/question_edit_tips.html:48 +msgid "learn more about Markdown" +msgstr "aprender mas sobre Markdown" #: templates/ask.html:4 templates/ask.html.py:60 msgid "Ask a question" -msgstr "" +msgstr "Hacer una pregunta" #: templates/ask.html:106 msgid "Use" -msgstr "" +msgstr "Usar" #: templates/ask.html:106 msgid "learn more about OpenID" -msgstr "" +msgstr "aprender mas sobre OpenID" #: templates/ask.html:106 templates/authopenid/signin.html:35 #: templates/authopenid/signin.html:61 msgid "Login" -msgstr "" +msgstr "Ingresar" #: templates/ask.html:109 msgid "Get your own " -msgstr "" +msgstr "Obtiene tu propio " #: templates/ask.html:117 templates/authopenid/sendpw.html:27 msgid "User name" -msgstr "" +msgstr "Nombre de usuario" #: templates/ask.html:120 msgid "Email: (won't be shown to anyone)" -msgstr "" +msgstr "Email: (no será mostrado a nadie)" #: templates/ask.html:127 msgid "Ask your question" -msgstr "" +msgstr "Haz tu pregunta" #: templates/badge.html:6 templates/badge.html.py:17 msgid "Badge" -msgstr "" +msgstr "Distinción" #: templates/badge.html:26 msgid "The users have been awarded with badges:" -msgstr "" +msgstr "Usuarios han sido galardonados con distinciones:" #: templates/badges.html:5 msgid "Badges summary" -msgstr "" +msgstr "Resumen de distinciones" #: templates/badges.html:16 templates/user_stats.html:113 msgid "Badges" -msgstr "" +msgstr "Distinciones" #: templates/badges.html:20 msgid "" @@ -732,10 +829,13 @@ msgid "" "the list of available badges and number of times each type of badge has been " "awarded." msgstr "" +"La comunidad te condecora con distinciones por tus preguntas, respuestas y " +"votos. Debajo esta la lista de las distinciones disponibles y la cantidad de " +"veces que han sido asignadas." #: templates/badges.html:47 msgid "Community badges" -msgstr "" +msgstr "Distinciones de la comunidad" #: templates/badges.html:53 msgid "" @@ -743,441 +843,472 @@ msgid "" "and ability in addition to actively participating in the community. Gold " "badge is the highest award in this community." msgstr "" +"Las distinciones de Oro son excepcionales. Para obtenerla debes demostrar un " +"profundo conocimiento y habilidad además de participar activamente en la " +"comunidad. La distinción de Oro es la condecoración máxima en esta comunidad" #: templates/badges.html:61 msgid "" "Obtaining silver badge requires significant patience. If you got one, you've " "very significantly contributed to this community" msgstr "" +"Obtener una distinción de Plata requiere de paciencia. Si has logrado una, " +"quiere decir que haz significativamente aportado a esta comunidad." #: templates/badges.html:64 msgid "bronze badge: often given as a special honor" msgstr "" +"distinción de bronce: con frecuencia entregada como reconocimiento especial." #: templates/badges.html:68 msgid "" "If you are active in this community, you will get this medal - still it is a " "special honor." msgstr "" +"Si eres un usuario activo de esta comunidad, recibirás esta distinción - de " +"todas maneras es un honor especial." #: templates/base.html:61 templates/base_content.html:60 msgid "congratulations, community gave you a badge" -msgstr "" +msgstr "felicitaciones, la comunidad te ha otorgado una distinción" #: templates/base.html:63 templates/base_content.html:62 msgid "profile" -msgstr "" +msgstr "perfil" #: templates/base_content.html:61 msgid "see" -msgstr "" +msgstr "ver" #: templates/book.html:7 msgid "reading channel" -msgstr "" +msgstr "canal de lectura" #: templates/book.html:26 msgid "[author]" -msgstr "" +msgstr "[autor]" #: templates/book.html:30 msgid "[publisher]" -msgstr "" +msgstr "[editorial]" #: templates/book.html:34 msgid "[publication date]" -msgstr "" +msgstr "[fecha de publicación]" #: templates/book.html:38 msgid "[price]" -msgstr "" +msgstr "[precio]" #: templates/book.html:39 msgid "currency unit" -msgstr "" +msgstr "unidad de moneda" #: templates/book.html:42 msgid "[pages]" -msgstr "" +msgstr "[páginas]" #: templates/book.html:43 msgid "pages abbreviation" -msgstr "" +msgstr "abreviación de páginas" #: templates/book.html:46 msgid "[tags]" -msgstr "" +msgstr "[etiquetas]" #: templates/book.html:56 msgid "author blog" -msgstr "" +msgstr "blog del autor" #: templates/book.html:62 msgid "book directory" -msgstr "" +msgstr "directorio del libro" #: templates/book.html:66 msgid "buy online" -msgstr "" +msgstr "comprar en-linea" #: templates/book.html:79 msgid "reader questions" -msgstr "" +msgstr "pregunta de lector" #: templates/book.html:82 msgid "ask the author" -msgstr "" +msgstr "preguntar al autor" #: templates/book.html:88 templates/book.html.py:93 #: templates/users_questions.html:17 msgid "this question was selected as favorite" -msgstr "" +msgstr "esta pregunta ha sido seleccionada como favorita" #: templates/book.html:88 templates/book.html.py:93 #: templates/users_questions.html:11 templates/users_questions.html.py:17 msgid "number of times" -msgstr "" +msgstr "numero de veces" #: templates/book.html:105 templates/index.html:47 #: templates/unanswered.html:37 templates/users_questions.html:30 msgid "votes" -msgstr "" +msgstr "votos" #: templates/book.html:108 msgid "the answer has been accepted to be correct" -msgstr "" +msgstr "la respuesta ha sido aceptada como correcta" #: templates/book.html:115 templates/index.html:48 #: templates/unanswered.html:38 templates/users_questions.html:40 msgid "views" -msgstr "" +msgstr "vistas" #: templates/book.html:125 templates/index.html:68 templates/question.html:112 #: templates/question.html.py:479 templates/tags.html:46 #: templates/unanswered.html:75 templates/unanswered.html.py:109 #: templates/users_questions.html:52 msgid "using tags" -msgstr "" +msgstr "usando etiquetas" #: templates/book.html:147 msgid "subscribe to book RSS feed" -msgstr "" +msgstr "suscribirse al RSS del libro" #: templates/book.html:147 templates/index.html:115 msgid "subscribe to the questions feed" -msgstr "" +msgstr "suscribirse al agregado de noticias" #: templates/close.html:6 templates/close.html.py:16 msgid "Close question" -msgstr "" +msgstr "Cerrar pregunta" #: templates/close.html:19 msgid "Close the question" -msgstr "" +msgstr "Cerrar la pregunta" #: templates/close.html:25 msgid "Reasons" -msgstr "" +msgstr "Razón" #: templates/close.html:28 msgid "OK to close" -msgstr "" +msgstr "OK para cerrar" #: templates/footer.html:5 +#, fuzzy msgid "About us" -msgstr "" +msgstr "Acerca de nosotros" #: templates/footer.html:6 templates/header.html:13 templates/index.html:83 msgid "faq" -msgstr "" +msgstr "preguntas frecuentes" #: templates/footer.html:8 +#, fuzzy msgid "Contact" -msgstr "" +msgstr "Contactenos" #: templates/footer.html:9 +#, fuzzy msgid "Privacy" -msgstr "" +msgstr "Privacidad" #: templates/footer.html:10 +#, fuzzy msgid "Feedback" -msgstr "" +msgstr "Contacto" #: templates/header.html:8 msgid "logout" -msgstr "" +msgstr "salir" #: templates/header.html:10 templates/authopenid/signup.html:39 msgid "login" -msgstr "" +msgstr "entrar" #: templates/header.html:12 templates/index.html:82 msgid "about" -msgstr "" +msgstr "acerca de nosotros" #: templates/header.html:23 +#, fuzzy msgid "back to home page" -msgstr "" +msgstr "volver página principal" #: templates/header.html:29 templates/header.html.py:60 msgid "questions" -msgstr "" +msgstr "preguntas" #: templates/header.html:31 templates/header.html.py:62 msgid "users" -msgstr "" +msgstr "usuarios" #: templates/header.html:32 +#, fuzzy msgid "books" -msgstr "" +msgstr "libros" #: templates/header.html:34 templates/index.html:120 msgid "unanswered questions" -msgstr "" +msgstr "sin respuesta" #: templates/header.html:38 msgid "my profile" -msgstr "" +msgstr "mi perfil" #: templates/header.html:42 msgid "ask a question" -msgstr "" +msgstr "hacer una pregunta" #: templates/header.html:57 +#, fuzzy msgid "search" -msgstr "" +msgstr "buscar" #: templates/index.html:6 msgid "Home" -msgstr "" +msgstr "Inicio" #: templates/index.html:21 msgid "Questions" -msgstr "" +msgstr "Preguntas" #: templates/index.html:23 +#, fuzzy msgid "last updated questions" -msgstr "" +msgstr "ultimas preguntas actualizadas" #: templates/index.html:23 templates/unanswered.html:20 +#, fuzzy msgid "newest" -msgstr "" +msgstr "más nuevas" #: templates/index.html:24 msgid "hottest questions" -msgstr "" +msgstr "preguntas calientes" #: templates/index.html:24 +#, fuzzy msgid "hottest" -msgstr "" +msgstr "más calientes" #: templates/index.html:25 msgid "most voted questions" -msgstr "" +msgstr "preguntas más votadas" #: templates/index.html:25 msgid "most voted" -msgstr "" +msgstr "más votadas" #: templates/index.html:26 msgid "all questions" -msgstr "" +msgstr "todas las preguntas" #: templates/index.html:46 templates/unanswered.html:36 #: templates/users_questions.html:35 msgid "answers" -msgstr "" +msgstr "respuestas" #: templates/index.html:68 templates/question.html:112 #: templates/question.html.py:479 templates/tags.html:46 #: templates/unanswered.html:75 templates/unanswered.html.py:109 #: templates/users_questions.html:52 +#, fuzzy msgid "see questions tagged" -msgstr "" +msgstr "ver preguntas etiquetadas" #: templates/index.html:79 msgid "welcome to website" -msgstr "" +msgstr "bienvenido a sitio" #: templates/index.html:88 msgid "Recent tags" -msgstr "" +msgstr "Etiquetas recientes" #: templates/index.html:93 #, python-format msgid "see questions tagged '%(tagname)s'" -msgstr "" +msgstr "ver preguntas etiquetadas '%(tagname)s'" #: templates/index.html:96 templates/index.html.py:120 +#, fuzzy msgid "popular tags" -msgstr "" +msgstr "etiquetas populares" #: templates/index.html:100 msgid "Recent awards" -msgstr "" +msgstr "Reconocimientos recientes" #: templates/index.html:106 msgid "given to" -msgstr "" +msgstr "dados a" #: templates/index.html:111 msgid "all awards" -msgstr "" +msgstr "todos los reconocimientos" #: templates/index.html:115 msgid "subscribe to last 30 questions by RSS" -msgstr "" +msgstr "suscribirse a las últimas 30 preguntas por RSS" #: templates/index.html:120 msgid "Still looking for more? See" -msgstr "" +msgstr "¿Aún sigues buscando más? Ver" #: templates/index.html:120 msgid "complete list of quesionts" -msgstr "" +msgstr "lista completa de preguntas" #: templates/index.html:120 +#, fuzzy msgid "or" -msgstr "" +msgstr "ó" #: templates/index.html:120 msgid "." -msgstr "" +msgstr "." #: templates/index.html:120 +#, fuzzy msgid "Please help us answer" -msgstr "" +msgstr "Ayudanos a responder" #: templates/logout.html:6 templates/logout.html.py:17 msgid "Logout" -msgstr "" +msgstr "Salir" #: templates/logout.html:20 msgid "" "As a registered user you can login with your OpenID, log out of the site or " "permanently remove your account." msgstr "" +"Como usuario registrado puedes ingresar con tu OpenID, salir del sitio o " +"eliminar de forma permanente tu cuenta." #: templates/logout.html:21 msgid "Logout now" -msgstr "" +msgstr "Salir ahora" #: templates/pagesize.html:5 +#, fuzzy msgid "Size per page:" -msgstr "" +msgstr "Entradas por página:" #: templates/paginator.html:5 +#, fuzzy msgid "Previous" -msgstr "" +msgstr "Previa" #: templates/privacy.html:6 templates/privacy.html.py:11 +#, fuzzy msgid "Privacy policy" -msgstr "" +msgstr "Privacidad" #: templates/privacy.html:15 msgid "general message about privacy" -msgstr "" +msgstr "mensaje de privacidad" #: templates/privacy.html:18 +#, fuzzy msgid "Site Visitors" -msgstr "" +msgstr "Visitantes del sitio" #: templates/privacy.html:20 msgid "what technical information is collected about visitors" -msgstr "" +msgstr "que información es recolectada sobre los usuarios" #: templates/privacy.html:23 msgid "Personal Information" -msgstr "" +msgstr "Información Personal" #: templates/privacy.html:25 msgid "details on personal information policies" -msgstr "" +msgstr "describir código de manejo de la información personal" #: templates/privacy.html:28 msgid "Other Services" -msgstr "" +msgstr "Otros servicios" #: templates/privacy.html:30 msgid "details on sharing data with third parties" -msgstr "" +msgstr "detalles sobre compartir información con terceros" #: templates/privacy.html:35 msgid "cookie policy details" -msgstr "" +msgstr "uso de cookies" #: templates/privacy.html:37 msgid "Policy Changes" -msgstr "" +msgstr "Cambios de Códigos" #: templates/privacy.html:38 msgid "how privacy policies can be changed" -msgstr "" +msgstr "como pueden ser cambiados los códigos de privacidad" #: templates/question.html:66 templates/question.html.py:78 msgid "i like this post (click again to cancel)" -msgstr "" +msgstr "Me gusta esta entrada (clickear devuelta para cancelar)" #: templates/question.html:68 templates/question.html.py:80 #: templates/question.html:273 msgid "current number of votes" -msgstr "" +msgstr "número actual de votos" #: templates/question.html:73 templates/question.html.py:84 msgid "i dont like this post (click again to cancel)" -msgstr "" +msgstr "No me gusta esta entrada (clickear devuelta para cancelar)" #: templates/question.html:90 msgid "mark this question as favorite (click again to cancel)" -msgstr "" +msgstr "marcar esta pregunta como favorita (clickear devuelta para cancelar)" #: templates/question.html:96 msgid "remove favorite mark from this question (click again to restore mark)" msgstr "" +"remover marca de favorito a esta pregunta (clickear devuelta para volver a " +"marcar)" #: templates/question.html:121 templates/question.html.py:304 #: templates/revisions_answer.html:53 templates/revisions_question.html:53 msgid "edit" -msgstr "" +msgstr "editar" #: templates/question.html:125 templates/question.html.py:314 msgid "delete" -msgstr "" +msgstr "borrar" #: templates/question.html:130 msgid "reopen" -msgstr "" +msgstr "re-abrir" #: templates/question.html:135 msgid "close" -msgstr "" +msgstr "cerrar" #: templates/question.html:141 templates/question.html.py:327 msgid "" "report as offensive (i.e containing spam, advertising, malicious text, etc.)" msgstr "" +"reportar como ofensivo (ej. contiene spam, publicidad, texto malicioso, etc.)" #: templates/question.html:142 templates/question.html.py:328 msgid "flag offensive" -msgstr "" +msgstr "marcar como ofensivo" #: templates/question.html:154 templates/question.html.py:337 #: templates/revisions_answer.html:65 templates/revisions_question.html:65 msgid "updated" -msgstr "" +msgstr "actualizado" #: templates/question.html:203 templates/question.html.py:384 #: templates/revisions_answer.html:63 templates/revisions_question.html:63 msgid "asked" -msgstr "" +msgstr "preguntado" #: templates/question.html:233 templates/question.html.py:411 msgid "comments" -msgstr "" +msgstr "comentarios" #: templates/question.html:234 templates/question.html.py:412 msgid "add comment" -msgstr "" +msgstr "agregar comentario" #: templates/question.html:247 #, python-format @@ -1185,487 +1316,469 @@ 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:249 #, python-format msgid "close date %(question.closed_at)s" -msgstr "" +msgstr "fecha de cerrada %(question.closed_at)s" #: templates/question.html:256 templates/questions.html:44 #: templates/user_stats.html:28 msgid "Answers" -msgstr "" +msgstr "Respuestas" #: templates/question.html:258 msgid "oldest answers will be shown first" -msgstr "" +msgstr "la respuesta mas vieja será mostrada primero" #: templates/question.html:258 msgid "oldest answers" -msgstr "" +msgstr "pregunta más vieja" #: templates/question.html:259 msgid "newest answers will be shown first" -msgstr "" +msgstr "preguntas más nuevas serán mostradas primero" #: templates/question.html:259 msgid "newest answers" -msgstr "" +msgstr "más nuevas" #: templates/question.html:260 msgid "most voted answers will be shown first" -msgstr "" +msgstr "las preguntas más votadas serán mostradas primero" #: templates/question.html:260 msgid "popular answers" -msgstr "" +msgstr "respuestas populares serán mostradas primero" #: templates/question.html:272 msgid "i like this answer (click again to cancel)" -msgstr "" +msgstr "me gusta esta respuesta (clickear devuelta para cancelar)" #: templates/question.html:278 msgid "i dont like this answer (click again to cancel)" -msgstr "" +msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)" #: templates/question.html:284 msgid "mark this answer as favorite (click again to undo)" -msgstr "" +msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)" #: templates/question.html:289 msgid "the author of the question has selected this answer as correct" -msgstr "" +msgstr "el autor de esta pregunta ha seleccionado esta respuesta como correcta" #: templates/question.html:311 msgid "undelete" -msgstr "" +msgstr "deshacer eliminar" #: templates/question.html:321 msgid "answer permanent link" -msgstr "" +msgstr "enlace permanente a respuesta" #: templates/question.html:322 msgid "permanent link" -msgstr "" +msgstr "enlace permanente" #: templates/question.html:436 msgid "Your answer" -msgstr "" +msgstr "Tu respuesta" #: templates/question.html:460 msgid "Answer the question" -msgstr "" +msgstr "Responde la pregunta" #: templates/question.html:462 msgid "Login to answer" -msgstr "" +msgstr "Ingresa para responder" #: templates/question.html:474 +#, fuzzy msgid "Question tags" -msgstr "" +msgstr "Tags de la pregunta" #: templates/question.html:484 msgid "question asked" -msgstr "" +msgstr "pregunta preguntada" #: templates/question.html:484 templates/question.html.py:490 #: templates/user_info.html:51 msgid "ago" -msgstr "" +msgstr "atrás" #: templates/question.html:487 msgid "question was seen" -msgstr "" +msgstr "la pregunta fue vista" #: templates/question.html:487 msgid "times" -msgstr "" +msgstr "veces" #: templates/question.html:490 msgid "last updated" -msgstr "" +msgstr "última vez actualizada" #: templates/question.html:495 +#, fuzzy msgid "Related questions" -msgstr "" +msgstr "Preguntas relacionadas" #: templates/question_edit.html:4 templates/question_edit.html.py:65 msgid "Edit question" -msgstr "" +msgstr "Editar pregunta" #: templates/question_edit_tips.html:4 msgid "question tips" -msgstr "" +msgstr "sugerencias sobre pregunta" #: templates/question_edit_tips.html:7 msgid "please ask a relevant question" -msgstr "" +msgstr "por favor hace preguntas relevantes" #: templates/question_edit_tips.html:10 msgid "please try provide enough details" -msgstr "" - -#: templates/question_edit_tips.html:13 -msgid "be clear and concise" -msgstr "" - -#: templates/question_edit_tips.html:16 -msgid "see frequently asked questions" -msgstr "" - -#: templates/question_edit_tips.html:22 -msgid "Markdown tips" -msgstr "" - -#: templates/question_edit_tips.html:25 -msgid "*italic* or __italic__" -msgstr "" - -#: templates/question_edit_tips.html:28 -msgid "**bold** or __bold__" -msgstr "" - -#: templates/question_edit_tips.html:31 -msgid "link" -msgstr "" - -#: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36 -msgid "text" -msgstr "" - -#: templates/question_edit_tips.html:36 -msgid "image" -msgstr "" - -#: templates/question_edit_tips.html:40 -msgid "numbered list:" -msgstr "" - -#: templates/question_edit_tips.html:45 -msgid "basic HTML tags are also supported" -msgstr "" - -#: templates/question_edit_tips.html:48 -msgid "learn more about Markdown" -msgstr "" +msgstr "intente proveer suficientes detalles" #: templates/questions.html:6 +#, fuzzy msgid "Question list" -msgstr "" +msgstr "Lista de preguntas" #: templates/questions.html:22 +#, fuzzy msgid "Tagged questions" -msgstr "" +msgstr "Preguntas etiquetadas" #: templates/questions.html:22 msgid "Query result" -msgstr "" +msgstr "Resultado de la búsqueda" #: templates/questions.html:22 msgid "All questions" -msgstr "" +msgstr "Todas las preguntas" #: templates/questions.html:24 +#, fuzzy msgid "New questions" -msgstr "" +msgstr "Preguntas nuevas" #: templates/questions.html:24 +#, fuzzy msgid "Newest" -msgstr "" +msgstr "Más recientes" #: templates/questions.html:25 +#, fuzzy msgid "Newest updated questions" -msgstr "" +msgstr "Ultimas preguntas actualizadas" #: templates/questions.html:25 +#, fuzzy msgid "Active" -msgstr "" +msgstr "Actividad" #: templates/questions.html:26 +#, fuzzy msgid "Questions with most answers" -msgstr "" +msgstr "Preguntas con más respuestas" #: templates/questions.html:26 +#, fuzzy msgid "Hottest" -msgstr "" +msgstr "Más calientes" #: templates/questions.html:27 msgid "Questions with most votes" -msgstr "" +msgstr "Preguntas con más votos" #: templates/questions.html:27 +#, fuzzy msgid "Best" -msgstr "" +msgstr "Mejor" #: templates/questions.html:45 +#, fuzzy msgid "Votes" -msgstr "" +msgstr "Votos" #: templates/questions.html:46 +#, fuzzy msgid "Visits" -msgstr "" +msgstr "Visitas" #: templates/questions.html:57 templates/questions.html.py:69 +#, fuzzy msgid "Community wiki" -msgstr "" +msgstr "Wiki de comunidad" #: templates/questions.html:83 +#, fuzzy msgid "Browse questions with tag of " -msgstr "" +msgstr "Ver preguntas etiquetadas con " #: templates/questions.html:125 templates/unanswered.html:105 msgid "Related tags" -msgstr "" +msgstr "Etiquetas relacionadas" #: templates/reopen.html:6 templates/reopen.html.py:16 msgid "Reopen question" -msgstr "" +msgstr "Re-abrir pregunta" #: templates/reopen.html:19 msgid "Open the previously closed question" -msgstr "" +msgstr "Abrir pregunta previamente cerrada" #: templates/reopen.html:22 msgid "The question was closed for the following reason " -msgstr "" +msgstr "La pregunta fue cerrada por el siguiente motivo " #: templates/reopen.html:22 msgid "reason - leave blank in english" -msgstr "" +msgstr "razón -" #: templates/reopen.html:22 msgid "on " -msgstr "" +msgstr "el " #: templates/reopen.html:22 msgid "date closed" -msgstr "" +msgstr "fecha cerrada" #: templates/reopen.html:29 msgid "Reopen this question" -msgstr "" +msgstr "Re-abrir esta pregunta" #: templates/revisions_answer.html:7 templates/revisions_answer.html.py:36 #: templates/revisions_question.html:8 templates/revisions_question.html:36 +#, fuzzy msgid "Revision history" -msgstr "" +msgstr "Historial de reputación" #: templates/tags.html:5 templates/tags.html.py:28 msgid "Tag list" -msgstr "" +msgstr "Lista de etiquetas" #: templates/tags.html:30 msgid "sorted alphabetically" -msgstr "" +msgstr "ordenar alfabéticamente" #: templates/tags.html:30 msgid "by name" -msgstr "" +msgstr "por nombre" #: templates/tags.html:31 msgid "sorted by frequency of tag use" -msgstr "" +msgstr "ordenar por frecuencia de uso de la etiqueta" #: templates/tags.html:31 msgid "by popularity" -msgstr "" +msgstr "por popularidad" #: templates/tags.html:37 msgid "All tags matching query" -msgstr "" +msgstr "Todas las etiquetas que coincidan con la busqueda" #: templates/tags.html:37 msgid "all tags - make this empty in english" -msgstr "" +msgstr "todas las tags" #: templates/tags.html:40 msgid "Nothing found" -msgstr "" +msgstr "Nada encontrado" #: templates/unanswered.html:7 templates/unanswered.html.py:18 msgid "Unanswered questions" -msgstr "" +msgstr "Preguntas sin respuesta" #: templates/unanswered.html:20 msgid "most recently asked questions" -msgstr "" +msgstr "preguntas hechas más recientemente" #: templates/unanswered.html:97 #, python-format msgid "have %(num_q)s unanswered questions" msgstr "" +"
%(num_q)s
preguntas sin " +"respuesta " #: templates/unanswered.html:99 msgid "Have a total of" -msgstr "" +msgstr "Hay un total de" #: templates/user_edit.html:6 +#, fuzzy msgid "Edit user profile" -msgstr "" +msgstr "Editar perfil de usuario" #: templates/user_edit.html:19 msgid "edit profile" -msgstr "" +msgstr "editar perfil" #: templates/user_edit.html:31 msgid "image associated with your email address" -msgstr "" +msgstr "imagen asociada con tu email" #: templates/user_edit.html:31 msgid "avatar" -msgstr "" +msgstr "avatar" #: templates/user_edit.html:36 templates/user_info.html:31 msgid "Registered user" -msgstr "" +msgstr "Usuario registrado" #: templates/user_edit.html:82 msgid "Update" -msgstr "" +msgstr "Actualización" #: templates/user_info.html:34 +#, fuzzy msgid "update profile" -msgstr "" +msgstr "actualizar perfil de usuario" #: templates/user_info.html:40 msgid "real name" -msgstr "" +msgstr "nombre real" #: templates/user_info.html:45 msgid "member for" -msgstr "" +msgstr "miembro de" #: templates/user_info.html:50 msgid "last seen" -msgstr "" +msgstr "última vez visto" #: templates/user_info.html:56 msgid "user website" -msgstr "" +msgstr "sitio web del usuario" #: templates/user_info.html:62 msgid "location" -msgstr "" +msgstr "ubicación" #: templates/user_info.html:69 msgid "age" -msgstr "" +msgstr "edad" #: templates/user_info.html:70 msgid "age unit" -msgstr "" +msgstr "unidad de edad" #: templates/user_info.html:75 msgid "todays unused votes" -msgstr "" +msgstr "votos de hoy no usados" #: templates/user_info.html:76 msgid "votes left" -msgstr "" +msgstr "votos restantes" #: templates/user_stats.html:15 msgid "User questions" -msgstr "" +msgstr "Preguntas del usuario" #: templates/user_stats.html:37 #, python-format msgid "the answer has been voted for %(vote_count)s times" -msgstr "" +msgstr "la respuesta ha sido votada %(vote_count)s veces" #: templates/user_stats.html:37 msgid "this answer has been selected as correct" -msgstr "" +msgstr "esta respuesta ha sido seleccionada como correcta" #: templates/user_stats.html:43 #, python-format msgid "the answer has been commented %(answered_question.comment_count)s times" msgstr "" +"la respuesta ha sido comentada %(answered_question.comment_count)s veces" #: templates/user_stats.html:56 msgid "votes total" -msgstr "" +msgstr "votos totales" #: templates/user_stats.html:65 msgid "user has voted up this many times" -msgstr "" +msgstr "el usuario ha votado positivo esta cantidad de veces" #: templates/user_stats.html:70 msgid "user voted down this many times" -msgstr "" +msgstr "el usuario voto negativo esta cantidad de veces" #: templates/user_stats.html:84 msgid "Tags" -msgstr "" +msgstr "Etiquetas" #: templates/user_stats.html:94 #, python-format msgid "see other questions tagged '%(tag)s' " -msgstr "" +msgstr "ver otras preguntas etiqueteadas '%(tag)s'" #: templates/user_tabs.html:7 +#, fuzzy msgid "User profile" -msgstr "" +msgstr "Perfil de usuario" #: templates/user_tabs.html:16 msgid "graph of user reputation" -msgstr "" +msgstr "gráfica de la reputación del usuario" #: templates/user_tabs.html:17 msgid "reputation history" -msgstr "" +msgstr "historial de reputación" #: templates/user_tabs.html:24 +#, fuzzy msgid "favorites" -msgstr "" +msgstr "favoritos" #: templates/user_tabs.html:29 msgid "settings" -msgstr "" +msgstr "preferencias" #: templates/user_votes.html:14 msgid "upvote" -msgstr "" +msgstr "votar positivo" #: templates/user_votes.html:16 msgid "downvote" -msgstr "" +msgstr "votar negativo" #: templates/users.html:5 templates/users.html.py:23 msgid "Users" -msgstr "" +msgstr "Usuarios" #: templates/users.html:26 +#, fuzzy msgid "recent" -msgstr "" +msgstr "reciente" #: templates/users.html:27 msgid "oldest" -msgstr "" +msgstr "más viejo" #: templates/users.html:28 msgid "by username" -msgstr "" +msgstr "por nombre de usuario" #: templates/users.html:34 #, python-format msgid "users matching query %(suser)s:" -msgstr "" +msgstr "usuarios que coincidan con la busqueda %(suser)s:" #: templates/users.html:38 msgid "Nothing found." -msgstr "" +msgstr "Nada encontrado." #: templates/users_questions.html:11 msgid "this questions was selected as favorite" -msgstr "" +msgstr "esta pregunta ha sido seleccionada como favorita" #: templates/users_questions.html:33 msgid "this answer has been accepted to be correct" -msgstr "" +msgstr "esta respuesta ha sido aceptada como correcta" #: templates/authopenid/changeemail.html:6 msgid "Account: change email" -msgstr "" +msgstr "Cuenta: cambiar el email" #: templates/authopenid/changeemail.html:9 msgid "" @@ -1673,301 +1786,324 @@ msgid "" "Please keep this email address up to date so we can send you a password-" "reset email if you request one." msgstr "" +"Aquí es donde puedes cambiar el email asociado a tu cuenta de usuario.Por " +"favor manten esta dirección de correo al día de forma que podamos mandarte " +"un cambio de contraseña si tu así lo requieres." #: templates/authopenid/changeemail.html:11 #: templates/authopenid/changeopenid.html:13 #: templates/authopenid/changepw.html:18 templates/authopenid/delete.html:14 #: templates/authopenid/delete.html:24 msgid "Please correct errors below:" -msgstr "" +msgstr "Por favor corrija los errores debajo: " #: templates/authopenid/changeemail.html:28 msgid "Email" -msgstr "" +msgstr "Email" #: templates/authopenid/changeemail.html:29 #: templates/authopenid/signin.html:60 msgid "Password" -msgstr "" +msgstr "Contraseña" #: templates/authopenid/changeemail.html:31 msgid "Change email" -msgstr "" +msgstr "Cambiar dirección email" #: templates/authopenid/changeopenid.html:7 msgid "Account: change OpenID URL" -msgstr "" +msgstr "Cuenta: cambiar la URL de OpenID" #: templates/authopenid/changeopenid.html:11 msgid "" "This is where you can change your OpenID URL. Make sure you remember it!" -msgstr "" +msgstr "Aquí es donde puedes cambiar tu OpenID URL. Asegurate de recordarla!" #: templates/authopenid/changeopenid.html:28 msgid "OpenID URL:" -msgstr "" +msgstr "URL de OpenID:" #: templates/authopenid/changeopenid.html:29 msgid "Change OpenID" -msgstr "" +msgstr "Cambiar OpenID" #: templates/authopenid/changepw.html:13 msgid "Account: change password" -msgstr "" +msgstr "Cuenta: cambiar contraseña" #: templates/authopenid/changepw.html:16 msgid "This is where you can change your password. Make sure you remember it!" -msgstr "" +msgstr "Aquí es donde puedes cambiar tu contraseña. Asegurate de recordarlo!" #: templates/authopenid/changepw.html:26 msgid "Current password" -msgstr "" +msgstr "Contraseña actual" #: templates/authopenid/changepw.html:27 msgid "New password" -msgstr "" +msgstr "Nueva contraseña" #: templates/authopenid/changepw.html:28 msgid "New password again" -msgstr "" +msgstr "Nueva contraseña nuevamente" #: templates/authopenid/changepw.html:29 templates/authopenid/settings.html:28 msgid "Change password" -msgstr "" +msgstr "Cambiar contraseña" #: templates/authopenid/complete.html:4 msgid "Connect your OpenID with this site" -msgstr "" +msgstr "Vincular tu OpenID con este sitio" #: templates/authopenid/complete.html:7 msgid "Connect your OpenID with your account on this site" -msgstr "" +msgstr "Vincular tu OpenID con tu cuenta en este sitio" #: templates/authopenid/complete.html:10 msgid "Your OpenID is accepted. Please complete this to finish registration." msgstr "" +"Tu OpenID es aceptada. Por favor completa lo siguiente para finalizar el " +"registro." #: templates/authopenid/complete.html:11 msgid "This account already exists, please use another." -msgstr "" +msgstr "Esta cuenta ya existe, por favor usar otra." #: templates/authopenid/complete.html:16 templates/authopenid/complete.html:29 #: templates/authopenid/signin.html:43 msgid "Sorry, looks like we have some errors:" -msgstr "" +msgstr "Ups, parece que hay errores:" #: templates/authopenid/complete.html:45 msgid "New account" -msgstr "" +msgstr "Nueva cuenta" #: templates/authopenid/complete.html:46 msgid "User name (will be shown to others, cannot be modified)" msgstr "" +"Nombre de usuario (será mostrado a otros, no puede ser modificado)" #: templates/authopenid/complete.html:47 msgid "Email (not shared with anyone)" -msgstr "" +msgstr "Email (no será compartido con nadie)" #: templates/authopenid/complete.html:48 msgid "create account" -msgstr "" +msgstr "crear cuenta" #: templates/authopenid/complete.html:56 msgid "Existing account" -msgstr "" +msgstr "Cuenta existente" #: templates/authopenid/complete.html:57 msgid "user name" -msgstr "" +msgstr "nombre de usuario" #: templates/authopenid/complete.html:58 msgid "password" -msgstr "" +msgstr "contraseña" #: templates/authopenid/complete.html:61 msgid "Register" -msgstr "" +msgstr "Registrarse" #: templates/authopenid/complete.html:62 templates/authopenid/signin.html:62 msgid "Forgot your password?" -msgstr "" +msgstr "¿Olvidaste tu contraseña?" #: templates/authopenid/delete.html:8 msgid "Account: delete account" -msgstr "" +msgstr "Cuenta: borrar cuenta" #: templates/authopenid/delete.html:12 msgid "" "Note: After deleting your account, anyone will be able to register this " "username." msgstr "" +"Nota: Luego de borrar tu cuenta, cualquiera podrá registrarse con este " +"nombre de usuario." #: templates/authopenid/delete.html:16 msgid "Check confirm box, if you want delete your account." -msgstr "" +msgstr "Marca caja de confirmación, si deseas borrar tu cuenta." #: templates/authopenid/delete.html:19 msgid "Password:" -msgstr "" +msgstr "Contraseña" #: templates/authopenid/delete.html:31 msgid "I am sure I want to delete my account." -msgstr "" +msgstr "Estoy seguro que quiero borrar mi cuenta." #: templates/authopenid/delete.html:32 msgid "Password/OpenID URL" -msgstr "" +msgstr "Contraseña/OpenID URL" #: templates/authopenid/delete.html:32 msgid "(required for your security)" -msgstr "" +msgstr "(requerido por tu seguridad)" #: templates/authopenid/delete.html:34 msgid "Delete account permanently" -msgstr "" +msgstr "Borrar la cuenta de forma permanente" #: templates/authopenid/sendpw.html:3 templates/authopenid/sendpw.html.py:7 msgid "Send new password" -msgstr "" +msgstr "Enviar nueva contraseña" #: templates/authopenid/sendpw.html:11 msgid "Lost your password? No problem - here you can reset it." -msgstr "" +msgstr "¿Haz perdido tu contraseña? No hay problema - aquí puedes re-crearla." #: templates/authopenid/sendpw.html:12 msgid "" "Please enter your username below and new password will be sent to your " "registered e-mail" msgstr "" +"Por favor, ingresa tu nombre de usuario y una nueva contraseña será enviada " +"a la dirección de email registrada." #: templates/authopenid/sendpw.html:29 msgid "Reset password" -msgstr "" +msgstr "Re-crear contraseña" #: templates/authopenid/sendpw.html:29 msgid "return to login" -msgstr "" +msgstr "volver a 'Ingresar'" #: templates/authopenid/sendpw.html:32 msgid "" "Note: your new password will be activated only after you click the " "activation link in the email message" msgstr "" +"Nota: tu nueva contraseña solo será activada luego de que hagas click en el " +"link de activación en el email enviado." #: templates/authopenid/settings.html:29 msgid "Give your account a new password." -msgstr "" +msgstr "Crea una nueva contraseña para tu cuenta." #: templates/authopenid/settings.html:30 msgid "Change email " -msgstr "" +msgstr "Cambiar email " #: templates/authopenid/settings.html:31 msgid "Add or update the email address associated with your account." -msgstr "" +msgstr "Agrega o actualiza el email asociado a tu cuenta." #: templates/authopenid/settings.html:34 msgid "Change openid associated to your account" -msgstr "" +msgstr "Cambia el OpenID asociado a tu cuenta" #: templates/authopenid/settings.html:37 msgid "Delete account" -msgstr "" +msgstr "Eliminar cuenta" #: templates/authopenid/settings.html:38 msgid "Erase your username and all your data from website" -msgstr "" +msgstr "Eliminar tu nombre de usuario y toda tu información del sitio" #: templates/authopenid/signin.html:3 templates/authopenid/signin.html:16 msgid "User login" -msgstr "" +msgstr "Ingreso de usuario" #: templates/authopenid/signin.html:21 msgid "we support two login modes" msgstr "" +"Puedes ingresar por cualquiera de los siguientes servicios, o " +"tradicionalmente- usando nombre de usuario y contraseña locales" #: templates/authopenid/signin.html:26 templates/authopenid/signup.html:49 msgid "Login with your OpenID" -msgstr "" +msgstr "Ingresar con tu OpenID" #: templates/authopenid/signin.html:28 msgid "select openid provider" -msgstr "" +msgstr "1) Selecciona tu proveedor de OpenID" #: templates/authopenid/signin.html:32 msgid "verify openid link and login" msgstr "" +"2) Varifica la URL de tu OpenID (escribe tu nombre de usuario donde dice " +"{nombre de usuario} si lo ves) y luego clickea 'ingresar'" #: templates/authopenid/signin.html:58 msgid "Use login name and password" -msgstr "" +msgstr "Nombre de usuario y contraseña" #: templates/authopenid/signin.html:59 msgid "Login name" -msgstr "" +msgstr "Nombre de usuario" #: templates/authopenid/signin.html:63 msgid "Create new acccount" -msgstr "" +msgstr "Crear cuenta nueva" #: templates/authopenid/signin.html:72 msgid "Why use OpenID?" -msgstr "" +msgstr "¿Porqué usar OpenID?" #: templates/authopenid/signin.html:76 msgid "with openid it is easier" -msgstr "" +msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña." #: templates/authopenid/signin.html:79 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:82 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:85 msgid "openid is supported open standard" msgstr "" +"OpenID es basado en un standard abierto, apoyado por muchas organizaciones." #: templates/authopenid/signin.html:89 msgid "Find out more" -msgstr "" +msgstr "Averigua más" #: templates/authopenid/signin.html:90 msgid "Get OpenID" -msgstr "" +msgstr "Adquiere una OpenID" #: templates/authopenid/signup.html:2 templates/authopenid/signup.html.py:6 msgid "Signup" -msgstr "" +msgstr "Registrate" #: templates/authopenid/signup.html:10 msgid "" "We support two types of user registration: conventional username/password, " "and" msgstr "" +"Soportamos dos formas de registro de usuario: convencional usuario/" +"contraseña, y" #: templates/authopenid/signup.html:10 msgid "the OpenID method" -msgstr "" +msgstr "OpenID" #: templates/authopenid/signup.html:15 msgid "Sorry, looks like we have some errors" -msgstr "" +msgstr "Ups, parece que hay errores." #: templates/authopenid/signup.html:33 msgid "Conventional registration" -msgstr "" +msgstr "Registro clásico" #: templates/authopenid/signup.html:34 msgid "choose a user name" -msgstr "" +msgstr "elije un nombre de usuario" #: templates/authopenid/signup.html:40 msgid "back to login" -msgstr "" +msgstr "volver al ingreso de usuario" #: templates/authopenid/signup.html:46 msgid "Register with your OpenID" -msgstr "" +msgstr "Registrate con tu OpenID" -- cgit v1.2.3-1-g7c22 From dd13b8868429ec13a3a51835045a072053595480 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Fri, 7 Aug 2009 13:21:45 -0300 Subject: Ignore .mo, .pyc, etc. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 18d3733f..50280c02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ settings_local.py *.pyc *.swp +*.mo +*.log +*.mo nbproject -- cgit v1.2.3-1-g7c22 From 0ecc79f112f6d650da24ee16a510beeaab1b308f Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Fri, 7 Aug 2009 13:56:03 -0300 Subject: Logos --- templates/content/images/logo.png | Bin 3631 -> 4564 bytes templates/content/images/originals/logo.svg | 118 ++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 templates/content/images/originals/logo.svg diff --git a/templates/content/images/logo.png b/templates/content/images/logo.png index 640eb1da..d70773ff 100644 Binary files a/templates/content/images/logo.png and b/templates/content/images/logo.png differ diff --git a/templates/content/images/originals/logo.svg b/templates/content/images/originals/logo.svg new file mode 100644 index 00000000..5ae06ddb --- /dev/null +++ b/templates/content/images/originals/logo.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + image/svg+xml + + + + + + Preguntalo + .com.uy + Si no lo sabes ¿?#*! + + -- cgit v1.2.3-1-g7c22 From 93530add821dd10e729a11caf8a9b809466bacc8 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Fri, 7 Aug 2009 14:00:18 -0300 Subject: =?UTF-8?q?Dise=C3=B1o=20en=20general.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/content/images/logo.png | Bin 4564 -> 5103 bytes templates/content/images/originals/logo.svg | 37 ++++++++++++++-------------- templates/content/style/style.css | 10 ++++---- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/templates/content/images/logo.png b/templates/content/images/logo.png index d70773ff..e2c97c8b 100644 Binary files a/templates/content/images/logo.png and b/templates/content/images/logo.png differ diff --git a/templates/content/images/originals/logo.svg b/templates/content/images/originals/logo.svg index 5ae06ddb..41b308da 100644 --- a/templates/content/images/originals/logo.svg +++ b/templates/content/images/originals/logo.svg @@ -47,7 +47,7 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.979899" - inkscape:cx="150.41956" + inkscape:cx="130.73959" inkscape:cy="39.353001" inkscape:document-units="px" inkscape:current-layer="layer1" @@ -74,9 +74,9 @@ transform="translate(-154.28572,-485.2193)"> Preguntalo + x="154.2048" + y="530.07758">Preguntalo .com.uy + x="303.99615" + y="540.42242" + style="font-size:12.09910297px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed">.com.uy Si no lo sabes ¿?#*! + x="157.2961" + y="500.24216">Si no lo sabes ¿?#*!... diff --git a/templates/content/style/style.css b/templates/content/style/style.css index d0fac81c..73683b16 100644 --- a/templates/content/style/style.css +++ b/templates/content/style/style.css @@ -92,12 +92,12 @@ blockquote #navBar .nav {margin:20px 0px 0px 16px;letter-spacing:1px; } #navBar .nav a {color:#333; background-color:#F9F7ED; padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:15px; font-weight:400; text-decoration:none;display: block;float: left;} #navBar .nav a:hover {text-decoration:underline} -#navBar .nav a.on {height:24px;line-height:28px;border:1px solid #B02B2C; background:#B02B2C; color:#FFF; font-weight:600; text-decoration:none} -#navBar .nav a.special {font-size:15px; color:#B02B2C; font-weight:bold; text-decoration:none; } +#navBar .nav a.on {height:24px;line-height:28px;border:1px solid green; background:green; color:#FFF; font-weight:600; text-decoration:none} +#navBar .nav a.special {font-size:15px; color:green; font-weight:bold; text-decoration:none; } #navBar .nav a.special:hover {text-decoration:underline;} #navBar .nav div.focus {float:right; padding-right:0px;} /*搜索栏*/ -#searchBar {background-color:#B02B2C;padding:5px;} +#searchBar {background-color:green;padding:5px;} #searchBar .content { } #searchBar .searchInput {font-size:13px; height:18px; width:400px;} #searchBar .searchBtn {font-size:14px; height:26px; width:80px;} @@ -524,7 +524,7 @@ a.comment-user:hover { /*标签列表*/ .tagsbox {} .tagsbox a {color:#000;line-height:30px;margin-right:10px;font-size:100%;background-color:#F9F7ED;padding:3px;} -.tagsbox a:hover {text-decoration:none;background-color:#F9F7CD;color:#B02B2C;} +.tagsbox a:hover {text-decoration:none;background-color:#F9F7CD;color:green;} .tagsList {margin:0; list-style-type:none;padding:0px;min-height:360px;} .tagsList li {width:235px; float:left;} .badge-list{margin:0; list-style-type:none;} @@ -996,4 +996,4 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p padding-left: 3px; padding-right: 3px; cursor:pointer; -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From 8052b751740ac4ccc6c8eb790041a512294c93f9 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Fri, 7 Aug 2009 14:11:23 -0300 Subject: =?UTF-8?q?Mas=20dise=C3=B1o,=20idioma,=20etc.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/es/LC_MESSAGES/django.po | 2 +- templates/content/images/logo.png | Bin 5103 -> 4972 bytes templates/content/images/originals/logo.svg | 12 ++++++------ templates/content/style/style.css | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 0136ea6f..e9058ad2 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-06 19:54-0300\n" +"POT-Creation-Date: 2009-08-07 14:09-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/templates/content/images/logo.png b/templates/content/images/logo.png index e2c97c8b..b5501337 100644 Binary files a/templates/content/images/logo.png and b/templates/content/images/logo.png differ diff --git a/templates/content/images/originals/logo.svg b/templates/content/images/originals/logo.svg index 41b308da..29c53f60 100644 --- a/templates/content/images/originals/logo.svg +++ b/templates/content/images/originals/logo.svg @@ -76,7 +76,7 @@ xml:space="preserve" style="font-size:35.70877075px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:semi-condensed;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold Semi-Condensed" x="154.2048" - y="530.07758" + y="532.07758" id="text2396" sodipodi:linespacing="125%" inkscape:export-filename="/home/bruno/repos/preguntalo/templates/content/images/text2424.png" @@ -85,12 +85,12 @@ sodipodi:role="line" id="tspan2398" x="154.2048" - y="530.07758">Preguntalo + y="532.07758">Preguntalo .com.uy Si no lo sabes ¿?#*!... + y="502.24216">Si no lo sabes ¿?#*!... diff --git a/templates/content/style/style.css b/templates/content/style/style.css index 73683b16..bfbd603a 100644 --- a/templates/content/style/style.css +++ b/templates/content/style/style.css @@ -93,9 +93,9 @@ blockquote #navBar .nav a {color:#333; background-color:#F9F7ED; padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:15px; font-weight:400; text-decoration:none;display: block;float: left;} #navBar .nav a:hover {text-decoration:underline} #navBar .nav a.on {height:24px;line-height:28px;border:1px solid green; background:green; color:#FFF; font-weight:600; text-decoration:none} -#navBar .nav a.special {font-size:15px; color:green; font-weight:bold; text-decoration:none; } +#navBar .nav a.special {font-size:15px; color:white;background:grey; font-weight:bold; text-decoration:none;} #navBar .nav a.special:hover {text-decoration:underline;} -#navBar .nav div.focus {float:right; padding-right:0px;} +#navBar .nav div.focus {position:absolute; top:4px; padding-right:0px;} /*搜索栏*/ #searchBar {background-color:green;padding:5px;} #searchBar .content { } -- cgit v1.2.3-1-g7c22 From be1b6a28517b94da64ce48f8c2be598488848202 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Fri, 7 Aug 2009 14:13:11 -0300 Subject: Tal vez no sea tan mala idea publicar los .mo. :) --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 50280c02..a4fc0520 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ settings_local.py *.pyc *.swp -*.mo *.log -*.mo nbproject -- cgit v1.2.3-1-g7c22 From 0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Sat, 8 Aug 2009 14:07:07 -0300 Subject: Removed settings_local.py to be able to merge. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a4fc0520..02ec314a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ settings_local.py *.pyc *.swp *.log +settings_local.py nbproject -- cgit v1.2.3-1-g7c22 From 58400574bdef21baa8dd240e269fe103f69ca508 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Sat, 8 Aug 2009 21:59:25 -0300 Subject: Changes for preguntalo project's header. * give priorty to "ask question" * small airy space to header --- templates/header.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/header.html b/templates/header.html index db08a39a..c3f5cc89 100644 --- a/templates/header.html +++ b/templates/header.html @@ -26,6 +26,10 @@
+
+ {% trans "ask a question" %} +
+ {% trans "questions" %} {% trans "tags" %} {% trans "users" %} @@ -38,9 +42,6 @@ {% trans "my profile" %} {% endif %} {% endcomment %} -
- {% trans "ask a question" %} -
-- cgit v1.2.3-1-g7c22 From 669422d2be418195e97456ee750514d9d42dad6e Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Sun, 9 Aug 2009 00:50:20 -0300 Subject: Made local settings work again. --- settings.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/settings.py b/settings.py index fac3c0d5..d51b3bbb 100644 --- a/settings.py +++ b/settings.py @@ -96,12 +96,3 @@ INSTALLED_APPS = ( # User settings from settings_local import * - -USE_I18N = True -LANGUAGE_CODE = 'en' -EMAIL_VALIDATION = 'off' -MIN_USERNAME_LENGTH = 1 -EMAIL_UNIQUE = False -APP_URL = 'http://server.com' #used by email notif system and RSS -GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA=' -GOOGLE_ANALYTICS_KEY = '' -- cgit v1.2.3-1-g7c22 From 5800c1e2e8013e7edfeed0e4113ce57961736991 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Sun, 9 Aug 2009 20:30:34 -0300 Subject: Added revers urls for links to work with i18n. --- locale/es/LC_MESSAGES/django.po | 2 +- templates/header.html | 22 +++++++++++----------- urls.py | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 8dfa7959..bcbf65bf 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-08 20:34-0300\n" +"POT-Creation-Date: 2009-08-09 01:12-0300\n" "PO-Revision-Date: \n" "Last-Translator: Bruno Sarlo \n" "Language-Team: LANGUAGE \n" diff --git a/templates/header.html b/templates/header.html index c3f5cc89..5751bed0 100644 --- a/templates/header.html +++ b/templates/header.html @@ -7,12 +7,12 @@ {% if request.user.is_authenticated %} {{ request.user.username }} {% get_score_badge request.user %} - {% trans "logout" %} + {% trans "logout" %} {% else %} - {% trans "login" %} + {% trans "login" %} {% endif %} - {% trans "about" %} - {% trans "faq" %} + {% trans "about" %} + {% trans "faq" %} @@ -27,15 +27,15 @@
- {% trans "ask a question" %} + {% trans "ask a question" %}
- {% trans "questions" %} - {% trans "tags" %} - {% trans "users" %} - - {% trans "badges" %} - {% trans "unanswered questions" %} + {% trans "questions" %} + {% trans "tags" %} + {% trans "users" %} + + {% trans "badges" %} + {% trans "unanswered questions" %} {% comment %} {% if request.user.is_authenticated %} diff --git a/urls.py b/urls.py index eb28cf69..4bc90bb9 100644 --- a/urls.py +++ b/urls.py @@ -47,9 +47,9 @@ urlpatterns = patterns('', url(r'^answers/(?P\d+)/comments/(?P\d+)/delete/$', app.delete_answer_comment, name='delete_answer_comment'), #place general question item in the end of other operations url(r'^questions/(?P\d+)//*', app.question, name='question'), - (r'^tags/$', app.tags), - (r'^tags/(?P[^/]+)/$', app.tag), - (r'^users/$',app.users), + url(r'^tags/$', app.tags, name='tags'), + url(r'^tags/(?P[^/]+)/$', app.tag), + url(r'^users/$',app.users, name='users'), url(r'^users/(?P\d+)/edit/$', app.edit_user, name='edit_user'), url(r'^users/(?P\d+)//*', app.user, name='user'), url(r'^badges/$',app.badges, name='badges'), -- cgit v1.2.3-1-g7c22 From dc88d182d20aa9f64aff5d56d1eaaf41176477fc Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Sun, 9 Aug 2009 23:52:13 -0300 Subject: Added About for Preguntalo.com.uy --- templates/about.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/about.html b/templates/about.html index eaf0d591..7beedb0b 100644 --- a/templates/about.html +++ b/templates/about.html @@ -12,10 +12,13 @@
-

edit file templates/about.html. Below are just suggestions of what can go here

-

what is your site for?

-

how does it work? what are roles of members?

-

is there a place to find out more about this website?

+

Preguntalo.com.uy es una herramienta social para hacer preguntas y recibir respuestas + de forma colectiva, incentivando a quienes aporten contenidos relevantes mediante un + sistema de reputación.

+

Si haces una pregunta ques es votada por los usuarios como útil, recibiras + puntos de reputación, también si respondes una pregunta, y más puntos aún si tu respuesta + es aceptada como la correcta!

+

Estamos en estapa de desarrollo. Si tenés alguna duda, preguntalo.com.uy! :)

{% endblock %} -- cgit v1.2.3-1-g7c22 From d307d51d70b392c309941de4db60a828039e03cb Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Sun, 9 Aug 2009 23:52:33 -0300 Subject: Included i18n for links site-wide. Hope there is no bit left. --- django_authopenid/urls.py | 6 +- forum/views.py | 25 ++--- locale/es/LC_MESSAGES/django.po | 196 +++++++++++++++++++++++++++++++------- templates/404.html | 6 +- templates/500.html | 4 +- templates/answer_edit_tips.html | 2 +- templates/badge.html | 2 +- templates/book.html | 4 +- templates/faq.html | 4 +- templates/footer.html | 6 +- templates/header.html | 6 +- templates/index.html | 16 ++-- templates/question.html | 18 ++-- templates/question_edit_tips.html | 2 +- templates/revisions_answer.html | 2 +- templates/revisions_question.html | 2 +- templates/tags.html | 4 +- templates/user_info.html | 2 +- templates/user_reputation.html | 2 +- templates/user_stats.html | 4 +- templates/user_tabs.html | 14 +-- templates/user_votes.html | 4 +- templates/users_questions.html | 6 +- urls.py | 85 +++++++++-------- 24 files changed, 278 insertions(+), 144 deletions(-) diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py index 6843e5c0..9c0887d8 100644 --- a/django_authopenid/urls.py +++ b/django_authopenid/urls.py @@ -21,10 +21,10 @@ urlpatterns = patterns('django_authopenid.views', # name='user_confirmchangepw'), # manage account settings - #url(r'^$', 'account_settings', name='user_account_settings'), + #url(r'^$', _('account_settings'), name='user_account_settings'), #url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'), - url(r'^%s$' % 'email/', 'changeemail', name='user_changeemail',kwargs = {'action':'change'}), - url(r'^%s%s$' % ('email/','validate/'), 'changeemail', name='user_changeemail',kwargs = {'action':'validate'}), + url(r'^%s$' % _('email/'), 'changeemail', name='user_changeemail',kwargs = {'action':'change'}), + url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_changeemail',kwargs = {'action':'validate'}), #url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'), url(r'^%s$' % _('delete/'), 'delete', name='user_delete'), ) diff --git a/forum/views.py b/forum/views.py index 6ef7bd6d..a118cc57 100644 --- a/forum/views.py +++ b/forum/views.py @@ -301,7 +301,7 @@ def ask(request): ip_addr = request.META['REMOTE_ADDR'], ) question.save() - return HttpResponseRedirect('%s%s%s' % ( _('/account/'),_('signin/'),('newquestion/'))) + return HttpResponseRedirect('/%s%s%s' % ( _('account/'),_('signin/'),_('newquestion/'))) else: form = AskForm() @@ -692,7 +692,8 @@ def answer(request, id): ip_addr = request.META['REMOTE_ADDR'], ) anon.save() - return HttpResponseRedirect('/account/signin/newanswer') + return HttpResponseRedirect('/%s%s%s' % ( _('account/'), + _('signin/'),_('newquestion/'))) return HttpResponseRedirect(question.get_absolute_url()) @@ -733,7 +734,7 @@ def tags(request): 'has_next': tags.has_next(), 'previous': tags.previous_page_number(), 'next': tags.next_page_number(), - 'base_url' : '/tags/?sort=%s&' % sortby + 'base_url' : '/%s?sort=%s&' % (_('tags/'), sortby) } }, context_instance=RequestContext(request)) @@ -986,11 +987,11 @@ def users(request): # default else: objects_list = Paginator(User.objects.all().order_by('-reputation'), USERS_PAGE_SIZE) - base_url = '/users/?sort=%s&' % sortby + base_url = '/%s?sort=%s&' % (_('users/'), sortby) else: sortby = "reputation" objects_list = Paginator(User.objects.extra(where=['username like %s'], params=['%' + suser + '%']).order_by('-reputation'), USERS_PAGE_SIZE) - base_url = '/users/?name=%s&sort=%s&' % (suser, sortby) + base_url = '/%s?name=%s&sort=%s&' % (_('users/'), suser, sortby) try: users = objects_list.page(page) @@ -1166,8 +1167,8 @@ def user_recent(request, user_id, user_view): self.type_id = type self.title = title self.summary = summary - self.title_link = u'/questions/%s/%s#%s' %(question_id, title, answer_id)\ - if int(answer_id) > 0 else u'/questions/%s/%s' %(question_id, title) + self.title_link = u'/%s%s/%s#%s' %(_('questions/'),question_id, title, answer_id)\ + if int(answer_id) > 0 else u'/%s%s/%s' %(_('questions/'), question_id, title) class AwardEvent: def __init__(self, time, type, id): self.time = time @@ -1406,9 +1407,9 @@ def user_responses(request, user_id, user_view): def __init__(self, type, title, question_id, answer_id, time, username, user_id, content): self.type = type self.title = title - self.titlelink = u'/questions/%s/%s#%s' % (question_id, title, answer_id) + self.titlelink = u'/%s%s/%s#%s' % (_('questions/'), question_id, title, answer_id) self.time = time - self.userlink = u'/users/%s/%s/' % (user_id, username) + self.userlink = u'/%s%s/%s/' % (_('users/'), user_id, username) self.username = username self.content = u'%s ...' % strip_tags(content)[:300] @@ -1741,7 +1742,7 @@ def __generate_comments_json(obj, type, user): "add_date" : comment.added_at.strftime('%Y-%m-%d'), "text" : comment.comment, "user_display_name" : comment_user.username, - "user_url" : "/users/%s/%s" % (comment_user.id, comment_user.username), + "user_url" : "/%s%s/%s" % (_('users/'), comment_user.id, comment_user.username), "delete_url" : delete_url }) @@ -2003,9 +2004,9 @@ def search(request): if keywords is None: return HttpResponseRedirect('/') if search_type == 'tag': - return HttpResponseRedirect('/tags/?q=%s&page=%s' % (keywords.strip(), page)) + return HttpResponseRedirect('/%s?q=%s&page=%s' % (_('tags/'), keywords.strip(), page)) elif search_type == "user": - return HttpResponseRedirect('/users/?q=%s&page=%s' % (keywords.strip(), page)) + return HttpResponseRedirect('/%s?q=%s&page=%s' % (_('users/'), keywords.strip(), page)) elif search_type == "question": template_file = "questions.html" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index bcbf65bf..b2580d42 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-09 01:12-0300\n" +"POT-Creation-Date: 2009-08-09 22:45-0300\n" "PO-Revision-Date: \n" "Last-Translator: Bruno Sarlo \n" "Language-Team: LANGUAGE \n" @@ -10,16 +10,149 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: settings.py:12 +#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:695 msgid "account/" msgstr "cuenta/" -#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:10 -#: django_authopenid/urls.py:11 django_authopenid/urls.py:13 -#: forum/views.py:304 +#: settings.py:12 urls.py:26 django_authopenid/urls.py:9 +#: django_authopenid/urls.py:10 django_authopenid/urls.py:11 +#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:696 msgid "signin/" msgstr "ingresar/" +#: urls.py:22 +msgid "upfiles/" +msgstr "archivossubidos/" + +#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26 +#: django_authopenid/urls.py:27 +msgid "email/" +msgstr "email/" + +#: urls.py:27 +msgid "change/" +msgstr "cambiar/" + +#: urls.py:28 +msgid "sendkey/" +msgstr "enviarclave/" + +#: urls.py:29 +msgid "verify/" +msgstr "verificar/" + +#: urls.py:30 +msgid "about/" +msgstr "acercadenosotros/" + +#: urls.py:31 +msgid "faq/" +msgstr "preguntasfrecuentes/" + +#: urls.py:32 +msgid "privacy/" +msgstr "códigodeprivacidad/" + +#: urls.py:33 +msgid "logout/" +msgstr "cerrarsesion/" + +#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 +msgid "answers/" +msgstr "respuestas/" + +#: urls.py:34 urls.py:46 +msgid "comments/" +msgstr "comentarios/" + +#: urls.py:35 urls.py:40 urls.py:54 +msgid "edit/" +msgstr "editar/" + +#: urls.py:36 urls.py:45 +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/views.py:1170 forum/views.py:1171 forum/views.py:1410 +msgid "questions/" +msgstr "preguntas/" + +#: urls.py:38 urls.py:64 +msgid "ask/" +msgstr "preguntar/" + +#: urls.py:39 +msgid "unanswered/" +msgstr "sinrespuesta/" + +#: urls.py:41 +msgid "close/" +msgstr "cerrar/" + +#: urls.py:42 +msgid "reopen/" +msgstr "reabrir/" + +#: urls.py:43 +msgid "answer/" +msgstr "respuesta/" + +#: urls.py:44 +msgid "vote/" +msgstr "votar/" + +#: urls.py:47 urls.py:48 django_authopenid/urls.py:29 +msgid "delete/" +msgstr "borrar/" + +#: urls.py:50 +#, fuzzy +msgid "question/" +msgstr "preguntas/" + +#: urls.py:51 urls.py:52 forum/views.py:737 forum/views.py:2007 +msgid "tags/" +msgstr "etiquetas/" + +#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:990 forum/views.py:994 +#: forum/views.py:1412 forum/views.py:2009 +msgid "users/" +msgstr "usuarios/" + +#: urls.py:56 urls.py:57 +msgid "badges/" +msgstr "distinciones/" + +#: urls.py:58 +msgid "messages/" +msgstr "mensajes/" + +#: urls.py:58 +msgid "markread/" +msgstr "marcarleido/" + +#: urls.py:60 +msgid "nimda/" +msgstr "administrador/" + +#: urls.py:61 +msgid "feeds/" +msgstr "" + +#: urls.py:62 +msgid "upload/" +msgstr "subir/" + +#: urls.py:63 urls.py:64 urls.py:65 +msgid "books/" +msgstr "libros/" + +#: urls.py:66 +msgid "search/" +msgstr "buscar/" + #: django_authopenid/forms.py:67 django_authopenid/views.py:102 msgid "i-names are not supported" msgstr "i-names no son soportados" @@ -111,10 +244,9 @@ msgstr "la nueva contraseña no coincide" msgid "Incorrect username." msgstr "Nombre de usuario incorrecto" -#: django_authopenid/urls.py:10 -#, fuzzy +#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:696 msgid "newquestion/" -msgstr "preguntas/" +msgstr "nuevapregunta/" #: django_authopenid/urls.py:11 msgid "newanswer/" @@ -140,14 +272,15 @@ msgstr "registrarse/" msgid "sendpw/" msgstr "enviarcontrasena/" -#: django_authopenid/urls.py:29 -msgid "delete/" -msgstr "borrar/" +#: django_authopenid/urls.py:27 +#, fuzzy +msgid "validate/" +msgstr "Cambiar dirección email" #: django_authopenid/views.py:108 #, python-format msgid "OpenID %(openid_url)s is invalid" -msgstr "" +msgstr "El OpenID %(openid_url)s no es valido" #: django_authopenid/views.py:417 django_authopenid/views.py:544 msgid "Welcome" @@ -256,7 +389,7 @@ msgstr "pregunta" #: forum/const.py:57 templates/book.html:110 msgid "answer" -msgstr "resputa" +msgstr "respuesta" #: forum/const.py:58 msgid "commented question" @@ -342,10 +475,6 @@ msgstr " - " msgid "latest questions" msgstr "últimas preguntas" -#: forum/feed.py:19 -msgid "questions/" -msgstr "preguntas/" - #: forum/forms.py:14 templates/answer_edit_tips.html:34 #: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31 #: templates/question_edit_tips.html:36 @@ -580,31 +709,27 @@ msgstr "preferencias del usuario" msgid "profile - user preferences" msgstr "perfil - preferencia de " -#: forum/views.py:304 -msgid "/account/" -msgstr "/cuenta/" - -#: forum/views.py:943 +#: forum/views.py:944 #, python-format msgid "subscription saved, %(email)s needs validation" msgstr "subscripción guardada, %(email)s necesita validación" -#: forum/views.py:1853 +#: forum/views.py:1854 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:1855 +#: forum/views.py:1856 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:1857 +#: forum/views.py:1858 #, python-format msgid "maximum upload file size is %sK" msgstr "tamaño máximo permitido es archivo %sK" -#: forum/views.py:1859 +#: forum/views.py:1860 #, python-format msgid "" "Error uploading file. Please contact the site administrator. Thank you. %s" @@ -1317,7 +1442,6 @@ msgstr "respuestas" #: templates/questions.html.py:156 templates/tags.html:47 #: templates/unanswered.html:75 templates/unanswered.html.py:109 #: templates/users_questions.html:52 -#, fuzzy msgid "see questions tagged" msgstr "ver preguntas etiquetadas" @@ -1682,7 +1806,7 @@ msgstr "¿Porqué usar y modificar etiquetas?" #: templates/question_retag.html:89 msgid "tags help us keep Questions organized" -msgstr "" +msgstr "las etiquetas nos permiten mantener las Preguntas organizadas" #: templates/question_retag.html:95 msgid "tag editors receive special awards from the community" @@ -2199,11 +2323,11 @@ msgstr "Ups, parece que hay errores:" #: templates/authopenid/complete.html:47 msgid "Screen name label" -msgstr "" +msgstr "Nombre de Usuario" #: templates/authopenid/complete.html:48 msgid "Email address label" -msgstr "su email (correo electrónico)" +msgstr "Su email (correo electrónico)" #: templates/authopenid/complete.html:49 msgid "create account" @@ -2238,6 +2362,8 @@ msgid "" "Note: After deleting your account, anyone will be able to register this " "username." msgstr "" +"Nota: Luego de borrar tu cuenta, cualquiera va a poder registrarse con este " +"nombre de usuario." #: templates/authopenid/delete.html:17 msgid "Check confirm box, if you want delete your account." @@ -2353,11 +2479,11 @@ msgstr "" #: templates/authopenid/signin.html:40 msgid "Click to sign in through any of these services." -msgstr "" +msgstr "Clickea para entrar por cualquiera de estos servicios." #: templates/authopenid/signin.html:103 msgid "Enter your Provider user name" -msgstr "" +msgstr "Ingresa tu nombre de usuario" #: templates/authopenid/signin.html:110 msgid "" @@ -2459,3 +2585,9 @@ msgstr "Registrate con tu OpenID" #: templates/authopenid/signup.html:51 msgid "Login with your OpenID" msgstr "Ingresar con tu OpenID" + +#~ msgid "/account/" +#~ msgstr "/cuenta/" + +#~ msgid "content/" +#~ msgstr "contenido/" diff --git a/templates/404.html b/templates/404.html index cd23a36b..6b3fc368 100644 --- a/templates/404.html +++ b/templates/404.html @@ -27,7 +27,7 @@
  • {% trans "this question or answer has been deleted;" %}
  • {% trans "url has error - please check it;" %}
    • -
  • {% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} faq；
    • +
  • {% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} faq；
  • {% trans "if you believe this error 404 should not have occured, please" %} {% trans "report this problem" %}
    • @@ -39,8 +39,8 @@
    • {% trans "see all questions" %} »
      • -
    • {% trans "see all tags" %} »
      • +
    • {% trans "see all questions" %} »
      • +
    • {% trans "see all tags" %} »
      • diff --git a/templates/500.html b/templates/500.html index 52dcafae..1990edbc 100644 --- a/templates/500.html +++ b/templates/500.html @@ -25,8 +25,8 @@ {% trans "please report the error to the site administrators if you wish" %} - faq » + faq »
      diff --git a/templates/badge.html b/templates/badge.html index 029ba0d9..73cba4ba 100644 --- a/templates/badge.html +++ b/templates/badge.html @@ -28,7 +28,7 @@
      {% for award in awards %} -

      {{ award.name }} {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}

      +

      {{ award.name }} {% get_score_badge_by_details award.rep award.gold award.silver award.bronze %}

      {% endfor %}
      diff --git a/templates/book.html b/templates/book.html index dddd13e6..37bf0101 100644 --- a/templates/book.html +++ b/templates/book.html @@ -98,7 +98,7 @@
      {% endif %}
      - +
      {{question.score|intcomma}}
      @@ -118,7 +118,7 @@

      - {{question.title}} + {{question.title}}

      {% for tag in question.tagname_list %} diff --git a/templates/faq.html b/templates/faq.html index 78c433ae..8df711ca 100644 --- a/templates/faq.html +++ b/templates/faq.html @@ -115,7 +115,7 @@

      {% trans "To register, do I need to create new password?" %}

      {% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %} - {% trans "Login now!" %} » + {% trans "Login now!" %} »

      @@ -129,7 +129,7 @@

      {% trans "Still have questions?" %}

      {% trans "Please ask your question, help make our community better!" %}

      diff --git a/templates/footer.html b/templates/footer.html index 637ca0d8..bac698cb 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -4,11 +4,11 @@
      - {% trans "about" %} | - {% trans "faq" %} | + {% trans "about" %} | + {% trans "faq" %} | {% trans "blog" %} | {% trans "contact us" %} | - {% trans "privacy policy" %} | + {% trans "privacy policy" %} | {% trans "give feedback" %}

      diff --git a/templates/header.html b/templates/header.html index 5751bed0..6f8657b3 100644 --- a/templates/header.html +++ b/templates/header.html @@ -6,7 +6,7 @@

      {% if request.user.is_authenticated %} - {{ request.user.username }} {% get_score_badge request.user %} + {{ request.user.username }} {% get_score_badge request.user %} {% trans "logout" %} {% else %} {% trans "login" %} @@ -39,7 +39,7 @@ {% comment %} {% if request.user.is_authenticated %} - {% trans "my profile" %} + {% trans "my profile" %} {% endif %} {% endcomment %}
      @@ -52,7 +52,7 @@ {% else %} @@ -179,7 +179,7 @@ {% gravatar question.last_edited_by 32 %} @@ -362,7 +362,7 @@ {% gravatar answer.last_edited_by 32 %} diff --git a/templates/user_reputation.html b/templates/user_reputation.html index bb7200de..270bb37d 100644 --- a/templates/user_reputation.html +++ b/templates/user_reputation.html @@ -33,7 +33,7 @@
      {{ rep.negative }}
      - {{ rep.title }}({{ rep.reputed_at }}) + {{ rep.title }}({{ rep.reputed_at }})

      {% endfor %} diff --git a/templates/user_stats.html b/templates/user_stats.html index 432a5b34..41253494 100644 --- a/templates/user_stats.html +++ b/templates/user_stats.html @@ -32,14 +32,14 @@
      {% for answered_question in answered_questions %}
      - +
      {{ answered_question.vote_count }}
      - {{answered_question.title}} {% if answered_question.comment_count %}{{answered_question.title}} {% if answered_question.comment_count %}({{answered_question.comment_count}}){% endif %}
      diff --git a/templates/user_tabs.html b/templates/user_tabs.html index bcc12b8f..96cc5aca 100644 --- a/templates/user_tabs.html +++ b/templates/user_tabs.html @@ -4,28 +4,28 @@
      {% trans "overview" %} + title="{% trans "User profile" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=stats">{% trans "overview" %} {% trans "recent activity" %} + title="{% trans "recent activity" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=recent">{% trans "recent activity" %} {% if request.user|is_user_self:view_user %} {% trans "responses" %} + href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=responses">{% trans "responses" %} {% endif %} {% trans "reputation history" %} + href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=reputation">{% trans "reputation history" %} {% if request.user|can_view_user_votes:view_user %} {% trans "casted votes" %} + title="{% trans "user vote record" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=votes">{% trans "casted votes" %} {% endif %} {% trans "favorites" %} + href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=favorites">{% trans "favorites" %} {% if request.user|can_view_user_preferences:view_user %} {% trans "settings" %} + href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=preferences">{% trans "settings" %} {% endif %}
      diff --git a/templates/user_votes.html b/templates/user_votes.html index 80fa27ee..45134ac9 100644 --- a/templates/user_votes.html +++ b/templates/user_votes.html @@ -18,9 +18,9 @@
      {% ifequal vote.answer_id 0 %} - {{ vote.title }} + {{ vote.title }} {% else %} - {{ vote.title }} + {{ vote.title }} {% endifequal %}
      diff --git a/templates/users_questions.html b/templates/users_questions.html index dfb87c8f..dd818ddb 100644 --- a/templates/users_questions.html +++ b/templates/users_questions.html @@ -23,7 +23,7 @@
      {% endif %}
      - +
      {{question.vote_count|intcomma}}
      @@ -43,7 +43,7 @@

      - {{question.title}} + {{question.title}}

      {% convert2tagname_list question %} @@ -55,7 +55,7 @@
      {% diff_date question.last_activity_at %} {% if question.la_username %} - {{question.la_username}} {% get_score_badge_by_details question.la_user_reputation question.la_user_gold question.la_user_silver question.la_user_bronze%} + {{question.la_username}} {% get_score_badge_by_details question.la_user_reputation question.la_user_gold question.la_user_silver question.la_user_bronze%} {% endif %}
      diff --git a/urls.py b/urls.py index 4bc90bb9..cce4969e 100644 --- a/urls.py +++ b/urls.py @@ -4,6 +4,7 @@ from django.contrib import admin from forum.views import index from forum import views as app from forum.feed import RssLastestQuestionsFeed +from django.utils.translation import ugettext as _ admin.autodiscover() feeds = { @@ -18,50 +19,50 @@ urlpatterns = patterns('', (r'^content/(?P.*)$', 'django.views.static.serve', {'document_root': os.path.join(APP_PATH, 'templates/content').replace('\\','/')} ), - (r'^upfiles/(?P.*)$', 'django.views.static.serve', + (r'^%s(?P.*)$' % _('upfiles/'), 'django.views.static.serve', {'document_root': os.path.join(APP_PATH, 'templates/upfiles').replace('\\','/')} ), - (r'^account/', include('django_authopenid.urls')), - (r'^signin/$', 'django_authopenid.views.signin'), - url(r'^email/change/$', 'django_authopenid.views.changeemail', name='user_changeemail'), - url(r'^email/sendkey/$', 'django_authopenid.views.send_email_key'), - url(r'^email/verify/(?P\d+)/(?P[\dabcdef]{32})/$', 'django_authopenid.views.verifyemail', name='user_verifyemail'), - url(r'^about/$', app.about, name='about'), - url(r'^faq/$', app.faq, name='faq'), - url(r'^privacy/$', app.privacy, name='privacy'), - url(r'^logout/$', app.logout, name='logout'), - url(r'^answers/(?P\d+)/comments/$', app.answer_comments, name='answer_comments'), - url(r'^answers/(?P\d+)/edit/$', app.edit_answer, name='edit_answer'), - url(r'^answers/(?P\d+)/revisions/$', app.answer_revisions, name='answer_revisions'), - url(r'^questions/$', app.questions, name='questions'), - url(r'^questions/ask/$', app.ask, name='ask'), - url(r'^questions/unanswered/$', app.unanswered, name='unanswered'), - url(r'^questions/(?P\d+)/edit/$', app.edit_question, name='edit_question'), - url(r'^questions/(?P\d+)/close/$', app.close, name='close'), - url(r'^questions/(?P\d+)/reopen/$', app.reopen, name='reopen'), - url(r'^questions/(?P\d+)/answer/$', app.answer, name='answer'), - url(r'^questions/(?P\d+)/vote/$', app.vote, name='vote'), - url(r'^questions/(?P\d+)/revisions/$', app.question_revisions, name='question_revisions'), - url(r'^questions/(?P\d+)/comments/$', app.question_comments, name='question_comments'), - url(r'^questions/(?P\d+)/comments/(?P\d+)/delete/$', app.delete_question_comment, name='delete_question_comment'), - url(r'^answers/(?P\d+)/comments/(?P\d+)/delete/$', app.delete_answer_comment, name='delete_answer_comment'), + (r'^%s' % _('account/'), include('django_authopenid.urls')), + (r'^%s/$' % _('signin/'), 'django_authopenid.views.signin'), + 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\d+)/(?P[\dabcdef]{32})/$' % (_('email/'), _('verify/')), 'django_authopenid.views.verifyemail', name='user_verifyemail'), + url(r'^%s$' % _('about/'), app.about, name='about'), + url(r'^%s$' % _('faq/'), app.faq, name='faq'), + url(r'^%s$' % _('privacy/'), app.privacy, name='privacy'), + url(r'^%s$' % _('logout/'), app.logout, name='logout'), + url(r'^%s(?P\d+)/%s$' % (_('answers/'), _('comments/')), app.answer_comments, name='answer_comments'), + url(r'^%s(?P\d+)/%s$' % (_('answers/'), _('edit/')), app.edit_answer, name='edit_answer'), + url(r'^%s(?P\d+)/%s$' % (_('answers/'), _('revisions/')), app.answer_revisions, name='answer_revisions'), + url(r'^%s$' % _('questions/'), app.questions, name='questions'), + url(r'^%s%s$' % (_('questions/'), _('ask/')), app.ask, name='ask'), + url(r'^%s%s$' % (_('questions/'), _('unanswered/')), app.unanswered, name='unanswered'), + url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('edit/')), app.edit_question, name='edit_question'), + url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('close/')), app.close, name='close'), + url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('reopen/')), app.reopen, name='reopen'), + url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('answer/')), app.answer, name='answer'), + url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('vote/')), app.vote, name='vote'), + url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('revisions/')), app.question_revisions, name='question_revisions'), + url(r'^%s(?P\d+)/%s$' % (_('questions/'), _('comments/')), app.question_comments, name='question_comments'), + url(r'^%s(?P\d+)/%s(?P\d+)/%s$' % (_('questions/'), _('questions/'),_('delete/')), app.delete_question_comment, name='delete_question_comment'), + url(r'^%s(?P\d+)/%s(?P\d+)/%s$' % (_('answers/'), _('answers/'),_('delete/')), app.delete_answer_comment, name='delete_answer_comment'), #place general question item in the end of other operations - url(r'^questions/(?P\d+)//*', app.question, name='question'), - url(r'^tags/$', app.tags, name='tags'), - url(r'^tags/(?P[^/]+)/$', app.tag), - url(r'^users/$',app.users, name='users'), - url(r'^users/(?P\d+)/edit/$', app.edit_user, name='edit_user'), - url(r'^users/(?P\d+)//*', app.user, name='user'), - url(r'^badges/$',app.badges, name='badges'), - url(r'^badges/(?P\d+)//*', app.badge, name='badge'), - url(r'^messages/markread/$',app.read_message, name='read_message'), - # (r'^admin/doc/', include('django.contrib.admindocs.urls')), - (r'^nimda/(.*)', admin.site.root), - (r'^feeds/(?P.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}), - (r'^upload/$', app.upload), - url(r'^books/$', app.books, name='books'), - url(r'^books/ask/(?P[^/]+)/$', app.ask_book, name='ask_book'), - url(r'^books/(?P[^/]+)/$', app.book, name='book'), - url(r'^search/$', app.search, name='search'), + url(r'^%s(?P\d+)//*' % _('question/'), app.question, name='question'), + url(r'^%s$' % _('tags/'), app.tags, name='tags'), + url(r'^%s(?P[^/]+)/$' % _('tags/'), app.tag), + url(r'^%s$' % _('users/'),app.users, name='users'), + url(r'^%s(?P\d+)/%s$' % (_('users/'), _('edit/')), app.edit_user, name='edit_user'), + url(r'^%s(?P\d+)//*' % _('users/'), app.user, name='user'), + url(r'^%s$' % _('badges/'),app.badges, name='badges'), + url(r'^%s(?P\d+)//*' % _('badges/'), app.badge, name='badge'), + url(r'^%s%s$' % (_('messages/'), _('markread/')),app.read_message, name='read_message'), + # (r'^admin/doc/' % _('admin/doc'), include('django.contrib.admindocs.urls')), + (r'^%s(.*)' % _('nimda/'), admin.site.root), + url(r'^feeds/(?P.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}), + (r'^%s$' % _('upload/'), app.upload), + url(r'^%s$' % _('books/'), app.books, name='books'), + url(r'^%s%s(?P[^/]+)/$' % (_('books/'), _('ask/')), app.ask_book, name='ask_book'), + url(r'^%s(?P[^/]+)/$' % _('books/'), app.book, name='book'), + url(r'^%s$' % _('search/'), app.search, name='search'), (r'^i18n/', include('django.conf.urls.i18n')), ) -- cgit v1.2.3-1-g7c22 From d2878ec8833f1c370d97e4fd0bbbb4984babcd42 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Sun, 9 Aug 2009 23:59:48 -0300 Subject: Applied preguntalo.com.uy colors. --- templates/content/style/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/content/style/style.css b/templates/content/style/style.css index b3fa6a6c..6c53eec9 100644 --- a/templates/content/style/style.css +++ b/templates/content/style/style.css @@ -119,14 +119,14 @@ blockquote border-bottom: none; padding:0px 12px 3px 12px; height:25px; line-height:30px;margin-left:10px; font-size:14px; font-weight:400; text-decoration:none;display: block;float: left;} #navBar .nav a:hover {text-decoration:underline} -#navBar .nav a.on {height:24px;line-height:28px;border:1px solid #d64000; background:#B02B2C; color:#FFF; font-weight:600; text-decoration:none} -#navBar .nav a.special {font-size:15px; color:#B02B2C; font-weight:bold; text-decoration:none; border:solid 1px;} +#navBar .nav a.on {height:24px;line-height:28px;border:1px solid green; background:green; color:#FFF; font-weight:600; text-decoration:none} +#navBar .nav a.special {font-size:15px; color:green; font-weight:bold; text-decoration:none; border:solid 1px;} #navBar .nav a.special:hover {text-decoration:underline;} #navBar .nav div.focus {position: absolute; top:10px; padding-right:0px;} /*搜索栏*/ #searchBar { - background-color:#9db2b1;/*#e9b96e;*/ + background-color:green;/*#e9b96e;*/ padding:5px 0 0 0;} /* #B02B2C */ #searchBar .content { } #searchBar .searchInput {font-size:13px; height:18px; width:400px;} -- cgit v1.2.3-1-g7c22 From d2c433b50c7a8289d79db8c2de98adc2ae83ba1d Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Mon, 10 Aug 2009 00:14:49 -0300 Subject: Translation. --- locale/es/LC_MESSAGES/django.po | 2 +- templates/question_edit_tips.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index b2580d42..54047c85 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -1693,7 +1693,7 @@ msgstr "las preguntas más votadas serán mostradas primero" #: templates/question.html:263 msgid "popular answers" -msgstr "respuestas populares serán mostradas primero" +msgstr "respuestas populares" #: templates/question.html:275 msgid "i like this answer (click again to cancel)" diff --git a/templates/question_edit_tips.html b/templates/question_edit_tips.html index f57440c2..caf292e3 100644 --- a/templates/question_edit_tips.html +++ b/templates/question_edit_tips.html @@ -13,7 +13,7 @@ {% trans "be clear and concise" %} - faq » + {% trans "faq" %} »
      -- cgit v1.2.3-1-g7c22 From 74d23cb7b0b85602fa7c7122f1c356ce7b80a49c Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Mon, 10 Aug 2009 00:39:40 -0300 Subject: Translation. * translate url update profile --- templates/user_info.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user_info.html b/templates/user_info.html index d6804d71..2ef2dd9a 100644 --- a/templates/user_info.html +++ b/templates/user_info.html @@ -31,7 +31,7 @@
      -- cgit v1.2.3-1-g7c22 From c56235fa146fa9c8b8cc34525822bdbf2ce188a8 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Tue, 11 Aug 2009 02:54:13 -0300 Subject: Fixed MyOpenID bug. It was not in the list of providers. --- django_authopenid/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/django_authopenid/views.py b/django_authopenid/views.py index 1cb8928b..cf14b538 100644 --- a/django_authopenid/views.py +++ b/django_authopenid/views.py @@ -358,6 +358,7 @@ def register(request): 'flickr':'flickr™', 'google':'Google™', 'aol':'AOL', + 'myopenid':'OpenID', } if provider_name not in providers: provider_logo = provider_name -- cgit v1.2.3-1-g7c22 From 6f3a352a24200a78b6a6431d55ceec860a16def7 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Tue, 11 Aug 2009 04:16:47 -0300 Subject: Typo. --- django_authopenid/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_authopenid/views.py b/django_authopenid/views.py index cf14b538..218a31a2 100644 --- a/django_authopenid/views.py +++ b/django_authopenid/views.py @@ -358,7 +358,7 @@ def register(request): 'flickr':'flickr™', 'google':'Google™', 'aol':'AOL', - 'myopenid':'OpenID', + 'myopenid':'MyOpenID', } if provider_name not in providers: provider_logo = provider_name -- cgit v1.2.3-1-g7c22 From 81b8cb0631e6a0e02665dd1ed60a5b9941e55bdb Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Tue, 11 Aug 2009 04:17:00 -0300 Subject: FAQ translation for Preguntalo.com.uy --- locale/es/LC_MESSAGES/django.po | 608 ++++++++++++++++++++++++---------------- templates/faq.html | 8 +- 2 files changed, 360 insertions(+), 256 deletions(-) diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 54047c85..383ed961 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-09 22:45-0300\n" +"POT-Creation-Date: 2009-08-11 04:13-0300\n" "PO-Revision-Date: \n" "Last-Translator: Bruno Sarlo \n" "Language-Team: LANGUAGE \n" @@ -10,13 +10,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:695 +#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698 msgid "account/" msgstr "cuenta/" #: settings.py:12 urls.py:26 django_authopenid/urls.py:9 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11 -#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:696 +#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699 msgid "signin/" msgstr "ingresar/" @@ -65,7 +65,7 @@ msgstr "respuestas/" msgid "comments/" msgstr "comentarios/" -#: urls.py:35 urls.py:40 urls.py:54 +#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34 msgid "edit/" msgstr "editar/" @@ -75,7 +75,7 @@ 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/views.py:1170 forum/views.py:1171 forum/views.py:1410 +#: forum/views.py:1416 msgid "questions/" msgstr "preguntas/" @@ -112,12 +112,12 @@ msgstr "borrar/" msgid "question/" msgstr "preguntas/" -#: urls.py:51 urls.py:52 forum/views.py:737 forum/views.py:2007 +#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013 msgid "tags/" msgstr "etiquetas/" -#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:990 forum/views.py:994 -#: forum/views.py:1412 forum/views.py:2009 +#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997 +#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015 msgid "users/" msgstr "usuarios/" @@ -137,10 +137,6 @@ msgstr "marcarleido/" msgid "nimda/" msgstr "administrador/" -#: urls.py:61 -msgid "feeds/" -msgstr "" - #: urls.py:62 msgid "upload/" msgstr "subir/" @@ -244,7 +240,7 @@ msgstr "la nueva contraseña no coincide" msgid "Incorrect username." msgstr "Nombre de usuario incorrecto" -#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:696 +#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699 msgid "newquestion/" msgstr "nuevapregunta/" @@ -282,54 +278,54 @@ msgstr "Cambiar dirección email" msgid "OpenID %(openid_url)s is invalid" msgstr "El OpenID %(openid_url)s no es valido" -#: django_authopenid/views.py:417 django_authopenid/views.py:544 +#: django_authopenid/views.py:418 django_authopenid/views.py:545 msgid "Welcome" msgstr "Bienvenido" -#: django_authopenid/views.py:507 +#: django_authopenid/views.py:508 msgid "Password changed." msgstr "Contraseña modificada" -#: django_authopenid/views.py:519 django_authopenid/views.py:524 +#: django_authopenid/views.py:520 django_authopenid/views.py:525 msgid "your email needs to be validated" msgstr "su correo electrónico necesita ser validado" -#: django_authopenid/views.py:681 django_authopenid/views.py:833 +#: django_authopenid/views.py:682 django_authopenid/views.py:834 #, python-format msgid "No OpenID %s found associated in our database" msgstr "El OpenID %s no esta asociada en nuestra base de datos" -#: django_authopenid/views.py:685 django_authopenid/views.py:840 +#: django_authopenid/views.py:686 django_authopenid/views.py:841 #, python-format msgid "The OpenID %s isn't associated to current user logged in" msgstr "El OpenID %s no esta asociada al usuario actualmente autenticado" -#: django_authopenid/views.py:693 +#: django_authopenid/views.py:694 msgid "Email Changed." msgstr "Email modificado" -#: django_authopenid/views.py:768 +#: django_authopenid/views.py:769 msgid "This OpenID is already associated with another account." msgstr "Este OpenID ya está asociada a otra cuenta." -#: django_authopenid/views.py:773 +#: django_authopenid/views.py:774 #, python-format msgid "OpenID %s is now associated with your account." msgstr "El OpenID %s está ahora asociada con tu cuenta." -#: django_authopenid/views.py:843 +#: django_authopenid/views.py:844 msgid "Account deleted." msgstr "Cuenta borrada." -#: django_authopenid/views.py:883 +#: django_authopenid/views.py:884 msgid "Request for new password" msgstr "Pedir nueva contraseña" -#: django_authopenid/views.py:896 +#: django_authopenid/views.py:897 msgid "A new password has been sent to your email address." msgstr "Una nueva contraseña ha sido enviada a tu cuenta de Email." -#: django_authopenid/views.py:926 +#: django_authopenid/views.py:927 #, python-format msgid "" "Could not change password. Confirmation key '%s' is not " @@ -338,7 +334,7 @@ msgstr "" "No se ha podido modificar la contraseña. La clave de confirmación '%s' no " "está registrada" -#: django_authopenid/views.py:935 +#: django_authopenid/views.py:936 msgid "" "Can not change password. User don't exist anymore in our " "database." @@ -346,7 +342,7 @@ msgstr "" "No se puede cambiar la contraseña. El usuario no existe más en nuestra base " "de datos." -#: django_authopenid/views.py:944 +#: django_authopenid/views.py:945 #, python-format msgid "Password changed for %s. You may now sign in." msgstr "Contraseña cambiada por %s. Ahora puedes ingresar." @@ -388,6 +384,9 @@ msgid "question" msgstr "pregunta" #: forum/const.py:57 templates/book.html:110 +#: templates/book.html.BASE.30295.html:110 +#: templates/book.html.LOCAL.30295.html:110 +#: templates/book.html.REMOTE.30295.html:110 msgid "answer" msgstr "respuesta" @@ -475,8 +474,8 @@ msgstr " - " msgid "latest questions" msgstr "últimas preguntas" -#: forum/forms.py:14 templates/answer_edit_tips.html:34 -#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31 +#: forum/forms.py:14 templates/answer_edit_tips.html:33 +#: templates/answer_edit_tips.html.py:37 templates/question_edit_tips.html:31 #: templates/question_edit_tips.html:36 msgid "title" msgstr "título" @@ -497,7 +496,7 @@ msgstr "contenido" msgid "question content must be > 10 characters" msgstr "el contenido de la pregunta debe ser al menos de 10 caracteres" -#: forum/forms.py:45 templates/header.html:34 templates/header.html.py:62 +#: forum/forms.py:45 templates/header.html:34 templates/header.html.py:63 msgid "tags" msgstr "etiquetas" @@ -528,8 +527,8 @@ 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:57 templates/question.html:199 -#: templates/question.html.py:380 templates/questions.html:58 +#: forum/forms.py:75 templates/index.html:57 templates/question.html:209 +#: templates/question.html.py:395 templates/questions.html:58 #: templates/questions.html.py:70 templates/unanswered.html:48 #: templates/unanswered.html.py:60 #, fuzzy @@ -588,42 +587,42 @@ msgstr "Perfil" msgid "this email has already been registered, please use another one" msgstr "este email ya ha sido registrado, por favor use otro" -#: forum/models.py:243 +#: forum/models.py:246 #, fuzzy, python-format msgid "%(author)s modified the question" msgstr "%(author) modificó la pregunta" -#: forum/models.py:247 +#: forum/models.py:250 #, python-format msgid "%(people)s posted %(new_answer_count)s new answers" msgstr "%(people)s publicaron %(new_answer_count)s nuevas respuestas" -#: forum/models.py:252 +#: forum/models.py:255 #, python-format msgid "%(people)s commented the question" msgstr "%(people)s comentarion la pregunta" -#: forum/models.py:257 +#: forum/models.py:260 #, python-format msgid "%(people)s commented answers" msgstr "%(people)s comentaron la respuesta" -#: forum/models.py:259 +#: forum/models.py:262 #, fuzzy, python-format msgid "%(people)s commented an answer" msgstr "%(people)s comentaron la respuesta" -#: forum/models.py:438 templates/badges.html:52 +#: forum/models.py:441 templates/badges.html:51 msgid "gold" msgstr "oro" -#: forum/models.py:439 templates/badges.html:60 +#: forum/models.py:442 templates/badges.html:59 msgid "silver" msgstr "plata" -#: forum/models.py:440 templates/badges.html:67 +#: forum/models.py:443 templates/badges.html:66 msgid "bronze" -msgstr "bronze" +msgstr "bronce" #: forum/user.py:16 templates/user_tabs.html:7 msgid "overview" @@ -709,27 +708,27 @@ msgstr "preferencias del usuario" msgid "profile - user preferences" msgstr "perfil - preferencia de " -#: forum/views.py:944 +#: forum/views.py:947 #, python-format msgid "subscription saved, %(email)s needs validation" msgstr "subscripción guardada, %(email)s necesita validación" -#: forum/views.py:1854 +#: forum/views.py:1860 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:1856 +#: forum/views.py:1862 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:1858 +#: forum/views.py:1864 #, python-format msgid "maximum upload file size is %sK" msgstr "tamaño máximo permitido es archivo %sK" -#: forum/views.py:1860 +#: forum/views.py:1866 #, python-format msgid "" "Error uploading file. Please contact the site administrator. Thank you. %s" @@ -740,16 +739,16 @@ msgstr "" msgid "updates from website" msgstr "actualizaciones del sitio" -#: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168 +#: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172 #: templates/header.html:37 msgid "badges" msgstr "distinciones" -#: forum/templatetags/extra_tags.py:140 forum/templatetags/extra_tags.py:167 +#: forum/templatetags/extra_tags.py:144 forum/templatetags/extra_tags.py:171 msgid "reputation points" msgstr "puntos de reputación" -#: forum/templatetags/extra_tags.py:221 +#: forum/templatetags/extra_tags.py:225 msgid " ago" msgstr " atras" @@ -827,13 +826,13 @@ msgid "Edit answer" msgstr "Editar respuesta" #: templates/answer_edit.html:24 templates/answer_edit.html.py:27 -#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40 -#: templates/question.html.py:43 templates/question_edit.html:27 +#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:43 +#: templates/question.html.py:46 templates/question_edit.html:27 msgid "hide preview" msgstr "ocultar previsualización" #: templates/answer_edit.html:27 templates/ask.html:28 -#: templates/question.html:43 templates/question_edit.html:27 +#: templates/question.html:46 templates/question_edit.html:27 msgid "show preview" msgstr "ver previsualización" @@ -853,22 +852,22 @@ msgid "select revision" msgstr "seleccionar revisión" #: templates/answer_edit.html:62 templates/ask.html:94 -#: templates/question.html:452 templates/question_edit.html:91 +#: templates/question.html:467 templates/question_edit.html:91 msgid "Toggle the real time Markdown editor preview" msgstr "Activar la visualización en tiempo real de Markdown" #: templates/answer_edit.html:62 templates/ask.html:94 -#: templates/question.html:452 templates/question_edit.html:91 +#: templates/question.html:467 templates/question_edit.html:91 msgid "toggle preview" msgstr "Activar previsualización" -#: templates/answer_edit.html:73 templates/question_edit.html:119 -#: templates/question_retag.html:75 +#: templates/answer_edit.html:71 templates/question_edit.html:115 +#: templates/question_retag.html:73 msgid "Save edit" msgstr "Guardar la edición" -#: templates/answer_edit.html:74 templates/close.html:29 -#: templates/question_edit.html:120 templates/question_retag.html:76 +#: templates/answer_edit.html:72 templates/close.html:29 +#: templates/question_edit.html:116 templates/question_retag.html:74 #: templates/reopen.html:30 templates/user_edit.html:83 #: templates/authopenid/changeemail.html:34 msgid "Cancel" @@ -899,40 +898,40 @@ msgstr "ser claro y conciso" msgid "see frequently asked questions" msgstr "ver preguntas frecuentes" -#: templates/answer_edit_tips.html:25 templates/question_edit_tips.html:22 +#: templates/answer_edit_tips.html:24 templates/question_edit_tips.html:22 msgid "Markdown tips" msgstr "sugerencias de Markdown" -#: templates/answer_edit_tips.html:28 templates/question_edit_tips.html:25 +#: templates/answer_edit_tips.html:27 templates/question_edit_tips.html:25 msgid "*italic* or __italic__" msgstr "*itálica* o __itálica__" -#: templates/answer_edit_tips.html:31 templates/question_edit_tips.html:28 +#: templates/answer_edit_tips.html:30 templates/question_edit_tips.html:28 msgid "**bold** or __bold__" msgstr "**negrita** o __negrita__" -#: templates/answer_edit_tips.html:34 templates/question_edit_tips.html:31 +#: templates/answer_edit_tips.html:33 templates/question_edit_tips.html:31 msgid "link" msgstr "enlace" -#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:38 +#: templates/answer_edit_tips.html:33 templates/answer_edit_tips.html.py:37 #: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36 msgid "text" msgstr "texto" -#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36 +#: templates/answer_edit_tips.html:37 templates/question_edit_tips.html:36 msgid "image" msgstr "imagen" -#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40 +#: templates/answer_edit_tips.html:41 templates/question_edit_tips.html:40 msgid "numbered list:" msgstr "lista numerada" -#: templates/answer_edit_tips.html:47 templates/question_edit_tips.html:45 +#: templates/answer_edit_tips.html:46 templates/question_edit_tips.html:45 msgid "basic HTML tags are also supported" msgstr "etiquetas básicas de HTML permitidas" -#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48 +#: templates/answer_edit_tips.html:49 templates/question_edit_tips.html:48 msgid "learn more about Markdown" msgstr "aprender mas sobre Markdown" @@ -942,22 +941,33 @@ msgstr "Hacer una pregunta" #: templates/ask.html:67 msgid "login to post question info" -msgstr "Inicie sesión para publicar pregunta." +msgstr "" +"Puedes comenzar a realizar tu pregunta de forma " +"anonima - actualmente no te encuentras Ingresado. Cuando envíes tu " +"pregunta, serás redireccionado a la página de Ingreso/registro. Tu pregunta " +"será guardada temporalemente y será enviada cuando ingreses. El proceso de " +"Ingreso/Registro es muy simple. Ingresar lleva unos 30 segundos, registrarse " +"por primera vez lleva un minuto." #: templates/ask.html:73 #, python-format msgid "must have valid %(email)s to post" -msgstr "debe de tener un %(email)s válido para publicar" +msgstr "" +"Parece ser que tu dirección de email, %(email)s no " +"ha sido validada aún. Para enviar mensajes debes verificar tu " +"dirección de email, puedes ver más detalles aquí.
      Puedes enviar tu pregunta ahora y validar tu email luego. Tu " +"pregunta será guardada mientras tanto y publicada cuando valides tu email." -#: templates/ask.html:108 +#: templates/ask.html:107 msgid "(required)" msgstr "(requerido)" -#: templates/ask.html:115 +#: templates/ask.html:114 msgid "Login/signup to post your question" msgstr "Iniciar sesión/registrarse para publicar su pregunta" -#: templates/ask.html:117 +#: templates/ask.html:116 msgid "Ask your question" msgstr "Haz tu pregunta" @@ -973,7 +983,7 @@ msgstr "Usuarios han sido galardonados con distinciones:" msgid "Badges summary" msgstr "Resumen de distinciones" -#: templates/badges.html:17 templates/user_stats.html:113 +#: templates/badges.html:17 templates/user_stats.html:114 msgid "Badges" msgstr "Distinciones" @@ -989,127 +999,180 @@ msgstr "" "Debajo esta la lista de las distinciones disponibles y la cantidad de veces " "que han sido asignadas." -#: templates/badges.html:49 +#: templates/badges.html:48 msgid "Community badges" msgstr "Distinciones de la comunidad" -#: templates/badges.html:55 +#: templates/badges.html:54 msgid "gold badge description" msgstr "" "Las distinciones de Oro son excepcionales. Para obtenerla debes demostrar un " "profundo conocimiento y habilidad además de participar activamente en la " "comunidad. La distinción de Oro es la condecoración máxima en esta comunidad" -#: templates/badges.html:63 +#: templates/badges.html:62 msgid "silver badge description" msgstr "" "Obtener una distinción de Plata requiere de paciencia. Si has logrado una, " "quiere decir que haz significativamente aportado a esta comunidad." -#: templates/badges.html:66 +#: templates/badges.html:65 msgid "bronze badge: often given as a special honor" msgstr "" "distinción de bronce: con frecuencia entregada como reconocimiento especial." -#: templates/badges.html:70 +#: templates/badges.html:69 msgid "bronze badge description" msgstr "" "Si eres un usuario activo de esta comunidad, recibirás esta distinción - de " "todas maneras es un honor especial." -#: templates/book.html:7 +#: templates/book.html:7 templates/book.html.BASE.30295.html:7 +#: templates/book.html.LOCAL.30295.html:7 +#: templates/book.html.REMOTE.30295.html:7 msgid "reading channel" msgstr "canal de lectura" -#: templates/book.html:26 +#: templates/book.html:26 templates/book.html.BASE.30295.html:26 +#: templates/book.html.LOCAL.30295.html:26 +#: templates/book.html.REMOTE.30295.html:26 msgid "[author]" msgstr "[autor]" -#: templates/book.html:30 +#: templates/book.html:30 templates/book.html.BASE.30295.html:30 +#: templates/book.html.LOCAL.30295.html:30 +#: templates/book.html.REMOTE.30295.html:30 msgid "[publisher]" msgstr "[editorial]" -#: templates/book.html:34 +#: templates/book.html:34 templates/book.html.BASE.30295.html:34 +#: templates/book.html.LOCAL.30295.html:34 +#: templates/book.html.REMOTE.30295.html:34 msgid "[publication date]" msgstr "[fecha de publicación]" -#: templates/book.html:38 +#: templates/book.html:38 templates/book.html.BASE.30295.html:38 +#: templates/book.html.LOCAL.30295.html:38 +#: templates/book.html.REMOTE.30295.html:38 msgid "[price]" msgstr "[precio]" -#: templates/book.html:39 +#: templates/book.html:39 templates/book.html.BASE.30295.html:39 +#: templates/book.html.LOCAL.30295.html:39 +#: templates/book.html.REMOTE.30295.html:39 msgid "currency unit" msgstr "unidad de moneda" -#: templates/book.html:42 +#: templates/book.html:42 templates/book.html.BASE.30295.html:42 +#: templates/book.html.LOCAL.30295.html:42 +#: templates/book.html.REMOTE.30295.html:42 msgid "[pages]" msgstr "[páginas]" -#: templates/book.html:43 +#: templates/book.html:43 templates/book.html.BASE.30295.html:43 +#: templates/book.html.LOCAL.30295.html:43 +#: templates/book.html.REMOTE.30295.html:43 msgid "pages abbreviation" msgstr "abreviación de páginas" -#: templates/book.html:46 +#: templates/book.html:46 templates/book.html.BASE.30295.html:46 +#: templates/book.html.LOCAL.30295.html:46 +#: templates/book.html.REMOTE.30295.html:46 msgid "[tags]" msgstr "[etiquetas]" -#: templates/book.html:56 +#: templates/book.html:56 templates/book.html.BASE.30295.html:56 +#: templates/book.html.LOCAL.30295.html:56 +#: templates/book.html.REMOTE.30295.html:56 msgid "author blog" msgstr "blog del autor" -#: templates/book.html:62 +#: templates/book.html:62 templates/book.html.BASE.30295.html:62 +#: templates/book.html.LOCAL.30295.html:62 +#: templates/book.html.REMOTE.30295.html:62 msgid "book directory" msgstr "directorio del libro" -#: templates/book.html:66 +#: templates/book.html:66 templates/book.html.BASE.30295.html:66 +#: templates/book.html.LOCAL.30295.html:66 +#: templates/book.html.REMOTE.30295.html:66 msgid "buy online" msgstr "comprar en-linea" -#: templates/book.html:79 +#: templates/book.html:79 templates/book.html.BASE.30295.html:79 +#: templates/book.html.LOCAL.30295.html:79 +#: templates/book.html.REMOTE.30295.html:79 msgid "reader questions" msgstr "pregunta de lector" -#: templates/book.html:82 +#: templates/book.html:82 templates/book.html.BASE.30295.html:82 +#: templates/book.html.LOCAL.30295.html:82 +#: templates/book.html.REMOTE.30295.html:82 msgid "ask the author" msgstr "preguntar al autor" #: templates/book.html:88 templates/book.html.py:93 -#: templates/users_questions.html:17 +#: templates/book.html.BASE.30295.html:88 +#: templates/book.html.BASE.30295.html:93 +#: templates/book.html.LOCAL.30295.html:88 +#: templates/book.html.LOCAL.30295.html:93 +#: templates/book.html.REMOTE.30295.html:88 +#: templates/book.html.REMOTE.30295.html:93 templates/users_questions.html:17 msgid "this question was selected as favorite" msgstr "esta pregunta ha sido seleccionada como favorita" #: templates/book.html:88 templates/book.html.py:93 -#: templates/users_questions.html:11 templates/users_questions.html.py:17 +#: templates/book.html.BASE.30295.html:88 +#: templates/book.html.BASE.30295.html:93 +#: templates/book.html.LOCAL.30295.html:88 +#: templates/book.html.LOCAL.30295.html:93 +#: templates/book.html.REMOTE.30295.html:88 +#: templates/book.html.REMOTE.30295.html:93 templates/users_questions.html:11 +#: templates/users_questions.html.py:17 msgid "number of times" msgstr "numero de veces" -#: templates/book.html:105 templates/index.html:48 templates/questions.html:46 -#: templates/unanswered.html:37 templates/users_questions.html:30 +#: templates/book.html:105 templates/book.html.BASE.30295.html:105 +#: templates/book.html.LOCAL.30295.html:105 +#: templates/book.html.REMOTE.30295.html:105 templates/index.html:48 +#: templates/questions.html:46 templates/unanswered.html:37 +#: templates/users_questions.html:30 msgid "votes" msgstr "votos" -#: templates/book.html:108 +#: templates/book.html:108 templates/book.html.BASE.30295.html:108 +#: templates/book.html.LOCAL.30295.html:108 +#: templates/book.html.REMOTE.30295.html:108 msgid "the answer has been accepted to be correct" msgstr "la respuesta ha sido aceptada como correcta" -#: templates/book.html:115 templates/index.html:49 templates/questions.html:47 -#: templates/unanswered.html:38 templates/users_questions.html:40 +#: templates/book.html:115 templates/book.html.BASE.30295.html:115 +#: templates/book.html.LOCAL.30295.html:115 +#: templates/book.html.REMOTE.30295.html:115 templates/index.html:49 +#: templates/questions.html:47 templates/unanswered.html:38 +#: templates/users_questions.html:40 msgid "views" msgstr "vistas" -#: templates/book.html:125 templates/index.html:69 templates/question.html:115 -#: templates/question.html.py:486 templates/questions.html:84 -#: templates/questions.html.py:156 templates/tags.html:47 -#: templates/unanswered.html:75 templates/unanswered.html.py:109 -#: templates/users_questions.html:52 +#: templates/book.html:125 templates/book.html.BASE.30295.html:125 +#: templates/book.html.LOCAL.30295.html:125 +#: templates/book.html.REMOTE.30295.html:125 templates/index.html:69 +#: templates/question.html:125 templates/question.html.py:499 +#: templates/questions.html:84 templates/questions.html.py:156 +#: templates/tags.html:49 templates/unanswered.html:75 +#: templates/unanswered.html.py:106 templates/users_questions.html:52 msgid "using tags" msgstr "usando etiquetas" -#: templates/book.html:147 +#: templates/book.html:147 templates/book.html.BASE.30295.html:147 +#: templates/book.html.LOCAL.30295.html:147 +#: templates/book.html.REMOTE.30295.html:147 msgid "subscribe to book RSS feed" msgstr "suscribirse al RSS del libro" -#: templates/book.html:147 templates/index.html:116 +#: templates/book.html:147 templates/book.html.BASE.30295.html:147 +#: templates/book.html.LOCAL.30295.html:147 +#: templates/book.html.REMOTE.30295.html:147 templates/index.html:118 msgid "subscribe to the questions feed" msgstr "suscribirse al agregado de noticias" @@ -1169,9 +1232,9 @@ msgstr "" msgid "What should I avoid in my answers?" msgstr "¿Que debo evitar en mis respuestas?" -#: templates/faq.html:28 templates/faq.html.py:132 +#: templates/faq.html:28 templates/faq.html.py:126 msgid "site title" -msgstr "título del sitio" +msgstr "Preguntalo.com.uy" #: templates/faq.html:28 msgid "" @@ -1209,75 +1272,118 @@ msgstr "¿Cómo funciona el sistema de reputación?" #: templates/faq.html:41 msgid "Rep system summary" -msgstr "resumen del sistema de reputación" +msgstr "" +"Cuando una pregunta o respuesta es votada positivamente, el usuario que la " +"realizo ganará algunos puntos, que llamamos \"puntos de reputación\". Estos " +"puntos sirven a groso modo para medir la confianza que la comunidad le " +"tiene. Diversas tareas de moderación son gradualmente asignadas a los " +"usuarios basado en estos puntos de reputación." -#: templates/faq.html:59 templates/user_votes.html:14 +#: templates/faq.html:42 +msgid "" +"For example, if you ask an interesting question or give a helpful answer, " +"your input will be upvoted. On the other hand if the answer is misleading - " +"it will be downvoted. Each vote in favor will generate 10 " +"points, each vote against will subtract 2 points. There is " +"a limit of 200 points that can be accumulated per question " +"or answer. The table below explains reputation point requirements for each " +"type of moderation task." +msgstr "" +"Por ejemplo, si haces una pregunta interesante o das una respuesta útil, tu " +"adición será votada positivamente. Por otro lado, si la respuesta es fuera " +"de lugar - será votada negativamente. Cada voto a favor genera 10" +" puntos, cada voto en contra restará 2 puntos. Hay " +"un limite de 200 puntos que puedes acumular por pregunta o " +"respuesta. La tabla debajo explica los puntos de reputación requeridos para " +"cada tarea de moderación." + +#: templates/faq.html:53 templates/user_votes.html:14 msgid "upvote" msgstr "votar positivo" -#: templates/faq.html:63 +#: templates/faq.html:57 msgid "use tags" msgstr "etiquetas usadas" -#: templates/faq.html:68 +#: templates/faq.html:62 msgid "add comments" msgstr "agregar comentarios" -#: templates/faq.html:72 templates/user_votes.html:16 +#: templates/faq.html:66 templates/user_votes.html:16 msgid "downvote" msgstr "votar negativo" -#: templates/faq.html:75 +#: templates/faq.html:69 msgid "open and close own questions" msgstr "abrir y cerrar sus propias preguntas" -#: templates/faq.html:79 +#: templates/faq.html:73 msgid "retag questions" msgstr "re-etiquetar preguntas" -#: templates/faq.html:83 +#: templates/faq.html:77 msgid "edit community wiki questions" msgstr "editar preguntas de la wiki comunitaria" -#: templates/faq.html:87 +#: templates/faq.html:81 msgid "edit any answer" msgstr "editar cualquier pregunta" -#: templates/faq.html:91 +#: templates/faq.html:85 msgid "open any closed question" msgstr "abrir cualquier pregunta cerrada" -#: templates/faq.html:95 +#: templates/faq.html:89 msgid "delete any comment" msgstr "borrar cualquier comentario" -#: templates/faq.html:99 +#: templates/faq.html:93 msgid "delete any questions and answers and perform other moderation tasks" msgstr "" "borrar cualquier pregunta o respuesta y realizar otras tareas de " "administración." -#: templates/faq.html:106 +#: templates/faq.html:100 msgid "how to validate email title" -msgstr "como validar el título del correo" +msgstr "¿Cómo validar mi correo electrónico?" -#: templates/faq.html:108 +#: templates/faq.html:102 msgid "how to validate email info" -msgstr "como validar la información del correo" +msgstr "" +"

      ¿Cómo? Si acabas de asignar o cambiar tu correo " +"electrónico - verifica tu casilla de mensajes y clickea en el link " +"incluido.
      El link contiene una clave generada especificamente " +"para ti. y vuelve a revisar tu casilla de mensajes.

      ¿Porqué? La validación del email es requerida " +"para estar seguros the que solo tu puedes enviar mensajes " +"bajo tu concentimiento y para minimizar el spam.
      Con " +"tu email podrás suscribirte a actualizaciones en las " +"preguntas mas interesantes. También, cuando te registras por primera vez - " +"se crea un imagen personal única de       gravatar." -#: templates/faq.html:112 +#: templates/faq.html:106 msgid "what is gravatar" -msgstr "qué es gravatar" +msgstr "¿Qué es gravatar?" -#: templates/faq.html:113 +#: templates/faq.html:107 msgid "gravatar faq info" -msgstr "preguntas frecuentes sobre gravatar" - -#: templates/faq.html:116 +msgstr "" +"Gravatar significa globalmente reconocido avatar - tu imagen única asociada a tu " +"email. Es simplemente una imagen que se muestra junto con tus mensajes en " +"sitios que soportan gravatar. Por defecto gravatar aparece como un cuadrado " +"rellenado con figuras parecidas a copos de nieve. Puedes seleccionar " +"tu imagen en gravatar.com" + +#: templates/faq.html:110 msgid "To register, do I need to create new password?" msgstr "¿Para registrarme, debo crearme una cuenta?" -#: templates/faq.html:117 +#: templates/faq.html:111 msgid "" "No, you don't have to. You can login through any service that supports " "OpenID, e.g. Google, Yahoo, AOL, etc." @@ -1285,19 +1391,21 @@ msgstr "" "No tienes porqué. Puedes ingresar usando cualquiera de los servicios que " "soportan OpenID, ej. Google, Yahoo, AOL, MyOpenID, etc." -#: templates/faq.html:118 +#: templates/faq.html:112 msgid "Login now!" msgstr "Ingresa ahora!" -#: templates/faq.html:123 +#: templates/faq.html:117 msgid "Why other people can edit my questions/answers?" msgstr "¿Porqué otras personas pueden editar mis preguntas y respuestas?" -#: templates/faq.html:124 +#: templates/faq.html:118 msgid "Goal of this site is..." -msgstr "El objetivo de este sitio es..." +msgstr "" +"El objetivo de este sitio es generar contenido valioso mediante preguntas y " +"respuestas, de forma colaborativa. " -#: templates/faq.html:124 +#: templates/faq.html:118 msgid "" "So questions and answers can be edited like wiki pages by experienced users " "of this site and this improves the overall quality of the knowledge base " @@ -1305,26 +1413,26 @@ msgid "" msgstr "" "Entonces, las preguntas y respuestas pueden ser editadas como wiki por " "usuarios con experiencia, y esto mejora la calidad general del conocimiento " -"guardado." +"acumulado." -#: templates/faq.html:125 +#: templates/faq.html:119 msgid "If this approach is not for you, we respect your choice." msgstr "" "Si esta forma de funcionamiento no es de tu agrado, respetamos tu elección." -#: templates/faq.html:129 +#: templates/faq.html:123 msgid "Still have questions?" msgstr "¿Aún tienes preguntas?" -#: templates/faq.html:130 +#: templates/faq.html:124 msgid "Please ask your question, help make our community better!" msgstr "Por favor haz tu pregunta, ¡ayudanos a mejorar nuestra comunidad!" -#: templates/faq.html:132 templates/header.html:33 templates/header.html.py:61 +#: templates/faq.html:126 templates/header.html:33 templates/header.html.py:62 msgid "questions" msgstr "preguntas" -#: templates/faq.html:132 templates/index.html:121 +#: templates/faq.html:126 templates/index.html:123 msgid "." msgstr "." @@ -1333,6 +1441,7 @@ msgid "about" msgstr "acerca de nosotros" #: templates/footer.html:8 templates/header.html:15 templates/index.html:84 +#: templates/question_edit_tips.html:16 msgid "faq" msgstr "preguntas frecuentes" @@ -1372,7 +1481,7 @@ msgstr "volver página principal" msgid "ask a question" msgstr "hacer una pregunta" -#: templates/header.html:35 templates/header.html.py:63 +#: templates/header.html:35 templates/header.html.py:64 msgid "users" msgstr "usuarios" @@ -1437,10 +1546,10 @@ msgstr "todas las preguntas" msgid "answers" msgstr "respuestas" -#: templates/index.html:69 templates/question.html:115 -#: templates/question.html.py:486 templates/questions.html:84 -#: templates/questions.html.py:156 templates/tags.html:47 -#: templates/unanswered.html:75 templates/unanswered.html.py:109 +#: templates/index.html:69 templates/question.html:125 +#: templates/question.html.py:499 templates/questions.html:84 +#: templates/questions.html.py:156 templates/tags.html:49 +#: templates/unanswered.html:75 templates/unanswered.html.py:106 #: templates/users_questions.html:52 msgid "see questions tagged" msgstr "ver preguntas etiquetadas" @@ -1458,44 +1567,44 @@ msgstr "Etiquetas recientes" msgid "see questions tagged '%(tagname)s'" msgstr "ver preguntas etiquetadas '%(tagname)s'" -#: templates/index.html:97 templates/index.html.py:121 +#: templates/index.html:97 templates/index.html.py:123 msgid "popular tags" msgstr "etiquetas populares" -#: templates/index.html:101 +#: templates/index.html:102 msgid "Recent awards" msgstr "Reconocimientos recientes" -#: templates/index.html:107 +#: templates/index.html:108 msgid "given to" msgstr "dados a" -#: templates/index.html:112 +#: templates/index.html:113 msgid "all awards" msgstr "todos los reconocimientos" -#: templates/index.html:116 +#: templates/index.html:118 msgid "subscribe to last 30 questions by RSS" msgstr "suscribirse a las últimas 30 preguntas por RSS" -#: templates/index.html:121 +#: templates/index.html:123 msgid "Still looking for more? See" msgstr "¿Aún sigues buscando más? Ver" -#: templates/index.html:121 +#: templates/index.html:123 msgid "complete list of questions" msgstr "lista completa de preguntas" -#: templates/index.html:121 +#: templates/index.html:123 #, fuzzy msgid "or" msgstr "ó" -#: templates/index.html:121 +#: templates/index.html:123 msgid "Please help us answer" msgstr "Ayudanos a responder" -#: templates/index.html:121 +#: templates/index.html:123 msgid "list of unanswered questions" msgstr "lista de preguntas sin respuesta" @@ -1585,75 +1694,77 @@ msgstr "Cambios de Códigos" msgid "how privacy policies can be changed" msgstr "como pueden ser cambiados los códigos de privacidad" -#: templates/question.html:69 templates/question.html.py:81 +#: templates/question.html:72 templates/question.html.py:73 +#: templates/question.html:85 templates/question.html.py:87 msgid "i like this post (click again to cancel)" msgstr "Me gusta esta entrada (clickear devuelta para cancelar)" -#: templates/question.html:71 templates/question.html.py:83 -#: templates/question.html:276 +#: templates/question.html:75 templates/question.html.py:89 +#: templates/question.html:289 msgid "current number of votes" msgstr "número actual de votos" -#: templates/question.html:76 templates/question.html.py:87 +#: templates/question.html:80 templates/question.html.py:81 +#: templates/question.html:94 templates/question.html.py:95 msgid "i dont like this post (click again to cancel)" msgstr "No me gusta esta entrada (clickear devuelta para cancelar)" -#: templates/question.html:93 +#: templates/question.html:100 templates/question.html.py:101 msgid "mark this question as favorite (click again to cancel)" msgstr "marcar esta pregunta como favorita (clickear devuelta para cancelar)" -#: templates/question.html:99 +#: templates/question.html:107 templates/question.html.py:108 msgid "remove favorite mark from this question (click again to restore mark)" msgstr "" "remover marca de favorito a esta pregunta (clickear devuelta para volver a " "marcar)" -#: templates/question.html:124 templates/question.html.py:307 +#: templates/question.html:134 templates/question.html.py:322 #: templates/revisions_answer.html:53 templates/revisions_question.html:53 msgid "edit" msgstr "editar" -#: templates/question.html:128 templates/question.html.py:317 +#: templates/question.html:138 templates/question.html.py:332 msgid "delete" msgstr "borrar" -#: templates/question.html:133 +#: templates/question.html:143 msgid "reopen" msgstr "re-abrir" -#: templates/question.html:138 +#: templates/question.html:148 msgid "close" msgstr "cerrar" -#: templates/question.html:144 templates/question.html.py:330 +#: templates/question.html:154 templates/question.html.py:345 msgid "" "report as offensive (i.e containing spam, advertising, malicious text, etc.)" msgstr "" "reportar como ofensivo (ej. contiene spam, publicidad, texto malicioso, etc.)" -#: templates/question.html:145 templates/question.html.py:331 +#: templates/question.html:155 templates/question.html.py:346 msgid "flag offensive" msgstr "marcar como ofensivo" -#: templates/question.html:157 templates/question.html.py:340 +#: templates/question.html:167 templates/question.html.py:355 #: templates/revisions_answer.html:65 templates/revisions_question.html:65 msgid "updated" msgstr "actualizado" -#: templates/question.html:206 templates/question.html.py:387 +#: templates/question.html:216 templates/question.html.py:402 #: templates/revisions_answer.html:63 templates/revisions_question.html:63 msgid "asked" msgstr "preguntado" -#: templates/question.html:236 templates/question.html.py:414 +#: templates/question.html:246 templates/question.html.py:429 msgid "comments" msgstr "comentarios" -#: templates/question.html:237 templates/question.html.py:415 +#: templates/question.html:247 templates/question.html.py:430 msgid "add comment" msgstr "agregar comentario" -#: templates/question.html:250 +#: templates/question.html:260 #, python-format msgid "" "The question has been closed for the following reason \"%(question." @@ -1662,117 +1773,117 @@ msgstr "" "La pregunta ha sido cerrada por el siguiente motivo \"%(question." "get_close_reason_display)s\" por" -#: templates/question.html:252 +#: templates/question.html:262 #, python-format msgid "close date %(question.closed_at)s" msgstr "fecha de cerrada %(question.closed_at)s" -#: templates/question.html:259 templates/user_stats.html:28 +#: templates/question.html:269 templates/user_stats.html:29 msgid "Answers" msgstr "Respuestas" -#: templates/question.html:261 +#: templates/question.html:271 msgid "oldest answers will be shown first" msgstr "la respuesta mas vieja será mostrada primero" -#: templates/question.html:261 +#: templates/question.html:271 msgid "oldest answers" msgstr "pregunta más vieja" -#: templates/question.html:262 +#: templates/question.html:272 msgid "newest answers will be shown first" msgstr "preguntas más nuevas serán mostradas primero" -#: templates/question.html:262 +#: templates/question.html:272 msgid "newest answers" msgstr "más nuevas" -#: templates/question.html:263 +#: templates/question.html:273 msgid "most voted answers will be shown first" msgstr "las preguntas más votadas serán mostradas primero" -#: templates/question.html:263 +#: templates/question.html:273 msgid "popular answers" msgstr "respuestas populares" -#: templates/question.html:275 +#: templates/question.html:287 templates/question.html.py:288 msgid "i like this answer (click again to cancel)" msgstr "me gusta esta respuesta (clickear devuelta para cancelar)" -#: templates/question.html:281 +#: templates/question.html:294 templates/question.html.py:295 msgid "i dont like this answer (click again to cancel)" msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)" -#: templates/question.html:287 +#: templates/question.html:300 templates/question.html.py:301 msgid "mark this answer as favorite (click again to undo)" msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)" -#: templates/question.html:292 +#: templates/question.html:306 templates/question.html.py:307 msgid "the author of the question has selected this answer as correct" msgstr "el autor de esta pregunta ha seleccionado esta respuesta como correcta" -#: templates/question.html:314 +#: templates/question.html:329 msgid "undelete" msgstr "deshacer eliminar" -#: templates/question.html:324 +#: templates/question.html:339 msgid "answer permanent link" msgstr "enlace permanente a respuesta" -#: templates/question.html:325 +#: templates/question.html:340 msgid "permanent link" msgstr "enlace permanente" -#: templates/question.html:438 +#: templates/question.html:453 msgid "Your answer" msgstr "Tu respuesta" -#: templates/question.html:441 +#: templates/question.html:456 msgid "you can answer anonymously and then login" msgstr "puedes responder de forma anónima y luego ingresar" -#: templates/question.html:465 +#: templates/question.html:479 msgid "Answer the question" msgstr "Responde la pregunta" -#: templates/question.html:467 +#: templates/question.html:481 msgid "Notify me daily if there are any new answers." msgstr "Notificarme diariamente si hay nuevas respuestas." -#: templates/question.html:469 +#: templates/question.html:483 msgid "once you sign in you will be able to subscribe for any updates here" msgstr "" "una vez que hayas ingresado podrás suscribirte a cualquiera de las " "actualizaciones aquí." -#: templates/question.html:481 +#: templates/question.html:494 #, fuzzy msgid "Question tags" msgstr "Tags de la pregunta" -#: templates/question.html:491 +#: templates/question.html:504 msgid "question asked" msgstr "pregunta preguntada" -#: templates/question.html:491 templates/question.html.py:497 +#: templates/question.html:504 templates/question.html.py:510 #: templates/user_info.html:51 #, fuzzy msgid "ago" msgstr " atras" -#: templates/question.html:494 +#: templates/question.html:507 msgid "question was seen" msgstr "la pregunta fue vista" -#: templates/question.html:494 +#: templates/question.html:507 msgid "times" msgstr "veces" -#: templates/question.html:497 +#: templates/question.html:510 msgid "last updated" msgstr "última vez actualizada" -#: templates/question.html:502 +#: templates/question.html:515 msgid "Related questions" msgstr "Preguntas relacionadas" @@ -1800,15 +1911,15 @@ msgstr "Cambiar etiquetas" msgid "up to 5 tags, less than 20 characters each" msgstr "hasta 5 etiquetas, menos de 20 caracteres cada una" -#: templates/question_retag.html:86 +#: templates/question_retag.html:82 msgid "Why use and modify tags?" msgstr "¿Porqué usar y modificar etiquetas?" -#: templates/question_retag.html:89 +#: templates/question_retag.html:85 msgid "tags help us keep Questions organized" msgstr "las etiquetas nos permiten mantener las Preguntas organizadas" -#: templates/question_retag.html:95 +#: templates/question_retag.html:91 msgid "tag editors receive special awards from the community" msgstr "" "los editores de etiquetas reciben distinciones especiales de la comunidad" @@ -1917,7 +2028,7 @@ msgstr "Las preguntas son ordenadas por el número de votos." msgid "Most voted questions are shown first." msgstr "Las preguntas más votadas son mostradas primero." -#: templates/questions.html:153 templates/unanswered.html:105 +#: templates/questions.html:153 templates/unanswered.html:102 msgid "Related tags" msgstr "Etiquetas relacionadas" @@ -1955,35 +2066,35 @@ msgstr "Re-abrir esta pregunta" msgid "Revision history" msgstr "Historial de revisiones" -#: templates/tags.html:6 templates/tags.html.py:29 +#: templates/tags.html:6 templates/tags.html.py:30 msgid "Tag list" msgstr "Lista de etiquetas" -#: templates/tags.html:31 +#: templates/tags.html:32 msgid "sorted alphabetically" msgstr "ordenar alfabéticamente" -#: templates/tags.html:31 +#: templates/tags.html:32 msgid "by name" msgstr "por nombre" -#: templates/tags.html:32 +#: templates/tags.html:33 msgid "sorted by frequency of tag use" msgstr "ordenar por frecuencia de uso de la etiqueta" -#: templates/tags.html:32 +#: templates/tags.html:33 msgid "by popularity" msgstr "por popularidad" -#: templates/tags.html:38 +#: templates/tags.html:39 msgid "All tags matching query" msgstr "Todas las etiquetas que coincidan con la busqueda" -#: templates/tags.html:38 +#: templates/tags.html:39 msgid "all tags - make this empty in english" msgstr "todas las tags" -#: templates/tags.html:41 +#: templates/tags.html:42 msgid "Nothing found" msgstr "Nada encontrado" @@ -1998,10 +2109,6 @@ msgstr "" "
      %(num_q)s
      preguntas sin " "respuesta " -#: templates/unanswered.html:99 -msgid "Have a total of" -msgstr "Hay un total de" - #: templates/user_edit.html:6 #, fuzzy msgid "Edit user profile" @@ -2072,62 +2179,62 @@ msgstr "votos restantes" msgid "Connect with Twitter" msgstr "Conectar con Twitter" -#: templates/user_preferences.html:12 +#: templates/user_preferences.html:13 msgid "Twitter account name:" msgstr "Nombre de usuario en Twitter:" -#: templates/user_preferences.html:14 +#: templates/user_preferences.html:15 msgid "Twitter password:" msgstr "Contraseña de Twitter:" -#: templates/user_preferences.html:16 +#: templates/user_preferences.html:17 msgid "Send my Questions to Twitter" msgstr "Enviar mis preguntas a Twitter" -#: templates/user_preferences.html:17 +#: templates/user_preferences.html:18 msgid "Send my Answers to Twitter" msgstr "Enviar mis respuestas a Twitter" -#: templates/user_preferences.html:18 +#: templates/user_preferences.html:19 msgid "Save" msgstr "Guardar" -#: templates/user_stats.html:15 +#: templates/user_stats.html:16 msgid "User questions" msgstr "Preguntas del usuario" -#: templates/user_stats.html:37 +#: templates/user_stats.html:38 #, python-format msgid "the answer has been voted for %(vote_count)s times" msgstr "la respuesta ha sido votada %(vote_count)s veces" -#: templates/user_stats.html:37 +#: templates/user_stats.html:38 msgid "this answer has been selected as correct" msgstr "esta respuesta ha sido seleccionada como correcta" -#: templates/user_stats.html:43 -#, python-format -msgid "the answer has been commented %(answered_question.comment_count)s times" +#: templates/user_stats.html:44 +#, fuzzy, python-format +msgid "the answer has been commented %(comment_count)s times" msgstr "" "la respuesta ha sido comentada %(answered_question.comment_count)s veces" -#: templates/user_stats.html:56 +#: templates/user_stats.html:57 msgid "votes total" msgstr "votos totales" -#: templates/user_stats.html:65 +#: templates/user_stats.html:66 msgid "user has voted up this many times" msgstr "el usuario ha votado positivo esta cantidad de veces" -#: templates/user_stats.html:70 +#: templates/user_stats.html:71 msgid "user voted down this many times" msgstr "el usuario voto negativo esta cantidad de veces" -#: templates/user_stats.html:84 +#: templates/user_stats.html:85 msgid "Tags" msgstr "Etiquetas" -#: templates/user_stats.html:94 +#: templates/user_stats.html:95 #, python-format msgid "see other questions tagged '%(tag)s' " msgstr "ver otras preguntas etiqueteadas '%(tag)s'" @@ -2209,7 +2316,7 @@ msgid "Your new Email" msgstr "Tu nuevo Email" #: templates/authopenid/changeemail.html:31 -#: templates/authopenid/signin.html:138 +#: templates/authopenid/signin.html:136 msgid "Password" msgstr "Contraseña" @@ -2317,7 +2424,7 @@ msgid "This account already exists, please use another." msgstr "Esta cuenta ya existe, por favor usar otra." #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32 -#: templates/authopenid/signin.html:121 +#: templates/authopenid/signin.html:120 msgid "Sorry, looks like we have some errors:" msgstr "Ups, parece que hay errores:" @@ -2349,7 +2456,7 @@ msgstr "contraseña" msgid "Register" msgstr "Registrarse" -#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:140 +#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138 msgid "Forgot your password?" msgstr "¿Olvidaste tu contraseña?" @@ -2493,7 +2600,7 @@ msgstr "" "Ingresa tu dirección (URL) de OpenID" -#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139 +#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137 msgid "Login" msgstr "Ingresar" @@ -2501,48 +2608,48 @@ msgstr "Ingresar" msgid "we support two login modes" msgstr "soportamos dos tipos de ingreso" -#: templates/authopenid/signin.html:136 +#: templates/authopenid/signin.html:134 msgid "Use login name and password" msgstr "Nombre de usuario y contraseña" -#: templates/authopenid/signin.html:137 +#: templates/authopenid/signin.html:135 msgid "Login name" msgstr "Nombre de usuario" -#: templates/authopenid/signin.html:141 +#: templates/authopenid/signin.html:139 msgid "Create new account" msgstr "Crear cuenta nueva" -#: templates/authopenid/signin.html:150 +#: templates/authopenid/signin.html:148 msgid "Why use OpenID?" msgstr "¿Porqué usar OpenID?" -#: templates/authopenid/signin.html:154 +#: templates/authopenid/signin.html:151 msgid "with openid it is easier" msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña." -#: templates/authopenid/signin.html:157 +#: templates/authopenid/signin.html:154 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:160 +#: templates/authopenid/signin.html:157 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:163 +#: templates/authopenid/signin.html:160 msgid "openid is supported open standard" msgstr "" "OpenID es basado en un standard abierto, apoyado por muchas organizaciones." -#: templates/authopenid/signin.html:167 +#: templates/authopenid/signin.html:165 msgid "Find out more" msgstr "Averigua más" -#: templates/authopenid/signin.html:168 +#: templates/authopenid/signin.html:166 msgid "Get OpenID" msgstr "Adquiere una OpenID" @@ -2578,14 +2685,17 @@ msgstr "elije un nombre de usuario" msgid "back to login" msgstr "volver al ingreso de usuario" -#: templates/authopenid/signup.html:48 +#: templates/authopenid/signup.html:46 msgid "Register with your OpenID" msgstr "Registrate con tu OpenID" -#: templates/authopenid/signup.html:51 +#: templates/authopenid/signup.html:49 msgid "Login with your OpenID" msgstr "Ingresar con tu OpenID" +#~ msgid "Have a total of" +#~ msgstr "Hay un total de" + #~ msgid "/account/" #~ msgstr "/cuenta/" diff --git a/templates/faq.html b/templates/faq.html index 8adee552..ffbc2ed7 100644 --- a/templates/faq.html +++ b/templates/faq.html @@ -39,13 +39,7 @@

      {% trans "How does reputation system work?" %}

      {% trans "Rep system summary" %}

      -

      - For example, if you ask an interesting question or give a helpful answer, your input will be upvoted. - On the other hand if the answer is misleading - it will be downvoted. - Each vote in favor will generate 10 points, each vote against will subtract 2 points. - There is a limit of 200 points that can be accumulated per question or answer. - - The table below explains reputation point requirements for each type of moderation task. +

      {% blocktrans %}For example, if you ask an interesting question or give a helpful answer, your input will be upvoted. On the other hand if the answer is misleading - it will be downvoted. Each vote in favor will generate 10 points, each vote against will subtract 2 points. There is a limit of 200 points that can be accumulated per question or answer. The table below explains reputation point requirements for each type of moderation task.{% endblocktrans %}

      -
      +
      diff --git a/templates/index.html b/templates/index.html index a1ab06a4..239b0ff4 100644 --- a/templates/index.html +++ b/templates/index.html @@ -24,7 +24,7 @@ {% trans "newest" %} {% trans "hottest" %} {% trans "most voted" %} - {% trans "all questions" %} + {% trans "all questions" %}
      @@ -80,8 +80,8 @@

      {% trans "welcome to website" %}

      {{ settings.APP_INTRO|safe }} -
      {% trans "about" %} »
      -
      {% trans "faq" %} »
      +
      {% trans "about" %} »
      +
      {% trans "faq" %} »
      {% endif %} @@ -94,7 +94,7 @@ title="{% blocktrans with tag.name as tagname %}see questions tagged '{{tagname}}'{% endblocktrans %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }} {% endfor %}

      -
      {% trans "popular tags" %} »
      +
      {% trans "popular tags" %} »
      @@ -103,13 +103,13 @@ -
      {% trans "all awards" %} »
      +
      {% trans "all awards" %} »
      @@ -118,7 +118,7 @@ {% endblock %} {% block tail %}
      -{% trans "Still looking for more? See" %} {% trans "complete list of questions" %} {% trans "or" %} {% trans "popular tags" %}{% trans "." %} {% trans "Please help us answer" %} {% trans "list of unanswered questions" %}{% trans "." %} +{% trans "Still looking for more? See" %} {% trans "complete list of questions" %} {% trans "or" %} {% trans "popular tags" %}{% trans "." %} {% trans "Please help us answer" %} {% trans "list of unanswered questions" %}{% trans "." %}
      {% endblock %} diff --git a/templates/question.html b/templates/question.html index eaff9da3..a0fc194d 100644 --- a/templates/question.html +++ b/templates/question.html @@ -27,7 +27,7 @@ {% if not question.closed and request.user.is_authenticated %}initEditor();{% endif %} lanai.highlightSyntax(); - $('#btLogin').bind('click', function(){window.location.href='/account/signin/'; } ) + $('#btLogin').bind('click', function(){window.location.href='{% url user_signin %}'; } ) }); function initEditor(){ @@ -112,7 +112,7 @@
      {% for tag in question.tagname_list %} + title="{% trans "see questions tagged" %} '{{ tag }}' {% trans "using tags" %}" rel="tag">{{ tag }} {% endfor %}
      @@ -164,7 +164,7 @@ {% gravatar question.last_edited_by 32 %}
      		- {{ question.last_edited_by.username }} + {{ question.last_edited_by.username }}
      - +
      {% get_score_badge question.last_edited_by %} @@ -213,7 +213,7 @@ {% gravatar question.author 32 %}
      		- +
      {% get_score_badge question.author %}
      @@ -346,7 +346,7 @@ {% gravatar answer.last_edited_by 32 %}       		- +
      - +
      {% get_score_badge answer.last_edited_by %}
      @@ -392,7 +392,7 @@ {% gravatar answer.author 32 %}       		- +
      {% get_score_badge answer.author %}
      @@ -503,7 +503,7 @@
      {% for question in similar_questions %}

      - {{ question.get_question_title }} + {{ question.get_question_title }}

      {% endfor %}
      diff --git a/templates/question_edit_tips.html b/templates/question_edit_tips.html index 4ac666a6..f57440c2 100644 --- a/templates/question_edit_tips.html +++ b/templates/question_edit_tips.html @@ -13,7 +13,7 @@ {% trans "be clear and concise" %} - faq » + faq »
      diff --git a/templates/revisions_answer.html b/templates/revisions_answer.html index 9c2e53eb..23606dc9 100644 --- a/templates/revisions_answer.html +++ b/templates/revisions_answer.html @@ -73,7 +73,7 @@       		+ {{ revision.author.username }}
      {% get_score_badge revision.author %}
      diff --git a/templates/revisions_question.html b/templates/revisions_question.html index 7ada3e74..b76ced24 100644 --- a/templates/revisions_question.html +++ b/templates/revisions_question.html @@ -73,7 +73,7 @@       		+ {{ revision.author.username }}
      {% get_score_badge revision.author %}
      diff --git a/templates/tags.html b/templates/tags.html index 6f9b3aed..fa2b4201 100644 --- a/templates/tags.html +++ b/templates/tags.html @@ -28,8 +28,8 @@
      {% trans "Tag list" %}
      - {% trans "by name" %} - {% trans "by popularity" %} + {% trans "by name" %} + {% trans "by popularity" %}
      diff --git a/templates/user_info.html b/templates/user_info.html index 8d35015c..d6804d71 100644 --- a/templates/user_info.html +++ b/templates/user_info.html @@ -31,7 +31,7 @@
      		{% trans "Registered user" %} {% if request.user|can_view_user_edit:view_user %} - {% trans "update profile" %} + {% trans "update profile" %} {% endif %}
      {% trans "Registered user" %} {% if request.user|can_view_user_edit:view_user %} - {% trans "update profile" %} + {% trans "update profile" %} {% endif %}
      -- cgit v1.2.3-1-g7c22 From 6c9a9ed6847c9a31f83b037655aa3739444a6959 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Tue, 11 Aug 2009 04:18:36 -0300 Subject: Typo --- templates/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/about.html b/templates/about.html index 7beedb0b..9a3e2101 100644 --- a/templates/about.html +++ b/templates/about.html @@ -18,7 +18,7 @@

      Si haces una pregunta ques es votada por los usuarios como útil, recibiras puntos de reputación, también si respondes una pregunta, y más puntos aún si tu respuesta es aceptada como la correcta!

      -

      Estamos en estapa de desarrollo. Si tenés alguna duda, preguntalo.com.uy! :)

      +

      Si tenés alguna duda, no dudes en preguntalo! :)

      {% endblock %} -- cgit v1.2.3-1-g7c22 From d23c07097cf975b80cfc30599d14ea1a11d068f2 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Tue, 11 Aug 2009 05:34:53 -0300 Subject: Fix for analytics to work, testing. --- templates/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index f182ca3c..9e877b42 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -27,7 +27,7 @@ -- cgit v1.2.3-1-g7c22 From 785db6187f5a5ee2cfd58de8e44bd08c10ad91cd Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Tue, 11 Aug 2009 15:41:48 -0300 Subject: Fixed voting problem. Should still work on i18n for JS voting and some urls. Non-ascii chars in tags bring syntax error for new meta-tags parsing. --- forum/models.py | 2 +- locale/es/LC_MESSAGES/django.po | 9 ++++----- templates/content/js/com.cnprog.i18n.js | 2 ++ templates/content/js/com.cnprog.post.js | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/forum/models.py b/forum/models.py index 9510476a..52f7af0f 100644 --- a/forum/models.py +++ b/forum/models.py @@ -180,7 +180,7 @@ class Question(models.Model): return [name for name in self.tagnames.split(u' ')] def tagname_meta_generator(self): - return ','.join([str(tag) for tag in self.tagname_list()]) + return u','.join([str(tag) for tag in self.tagname_list()]) def get_absolute_url(self): return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-')) diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 383ed961..16ccc51a 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-11 04:13-0300\n" +"POT-Creation-Date: 2009-08-11 15:39-0300\n" "PO-Revision-Date: \n" "Last-Translator: Bruno Sarlo \n" "Language-Team: LANGUAGE \n" @@ -108,9 +108,8 @@ msgid "delete/" msgstr "borrar/" #: urls.py:50 -#, fuzzy msgid "question/" -msgstr "preguntas/" +msgstr "pregunta/" #: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013 msgid "tags/" @@ -1291,8 +1290,8 @@ msgid "" msgstr "" "Por ejemplo, si haces una pregunta interesante o das una respuesta útil, tu " "adición será votada positivamente. Por otro lado, si la respuesta es fuera " -"de lugar - será votada negativamente. Cada voto a favor genera 10" -" puntos, cada voto en contra restará 2 puntos. Hay " +"de lugar - será votada negativamente. Cada voto a favor genera 10 puntos, cada voto en contra restará 2 puntos. Hay " "un limite de 200 puntos que puedes acumular por pregunta o " "respuesta. La tabla debajo explica los puntos de reputación requeridos para " "cada tarea de moderación." diff --git a/templates/content/js/com.cnprog.i18n.js b/templates/content/js/com.cnprog.i18n.js index 848ad59e..6ba8b59d 100644 --- a/templates/content/js/com.cnprog.i18n.js +++ b/templates/content/js/com.cnprog.i18n.js @@ -140,6 +140,8 @@ var i18nEs = { 'enter image url':'introduzca la URL de la imagen, por ejemplo：
      http://www.example.com/image.jpg \"titulo de imagen\"', 'enter url':'introduzca direcciones web, ejemplo：
      http://www.cnprog.com/ \"titulo del enlace\"

      "', 'upload image':'cargar imagen：', + 'questions/' : 'preguntas/', + 'vote/' : 'votar/', }; var i18n = { diff --git a/templates/content/js/com.cnprog.post.js b/templates/content/js/com.cnprog.post.js index 546cf101..aa6c51b6 100644 --- a/templates/content/js/com.cnprog.post.js +++ b/templates/content/js/com.cnprog.post.js @@ -243,7 +243,7 @@ var Vote = function(){ type: "POST", cache: false, dataType: "json", - url: "/questions/" + questionId + "/vote/", + url: "/" + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"), data: { "type": voteType, "postId": postId }, error: handleFail, success: function(data){callback(object, voteType, data)}}); -- cgit v1.2.3-1-g7c22 From ab6ccc728cba1bddebe26a73f3bff0cc9c82f7f5 Mon Sep 17 00:00:00 2001 From: Bruno Sarlo Date: Tue, 11 Aug 2009 15:49:55 -0300 Subject: Added unicode encoding for tags. --- forum/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forum/models.py b/forum/models.py index 52f7af0f..9060b436 100644 --- a/forum/models.py +++ b/forum/models.py @@ -180,7 +180,7 @@ class Question(models.Model): return [name for name in self.tagnames.split(u' ')] def tagname_meta_generator(self): - return u','.join([str(tag) for tag in self.tagname_list()]) + return u','.join([unicode(tag) for tag in self.tagname_list()]) def get_absolute_url(self): return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-')) -- cgit v1.2.3-1-g7c22 From dcda943830ce044d3adeb0c801dd9f06a0feb6ea Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 12 Aug 2009 15:26:56 -0400 Subject: merged Bruno url translations, removed his local mods, added settings.BOOKS_ON, validated more templates --- context.py | 1 + django_authopenid/views.py | 2 + forum/models.py | 10 +- forum/views.py | 2 +- locale/en/LC_MESSAGES/django.mo | Bin 13992 -> 14334 bytes locale/en/LC_MESSAGES/django.po | 606 +++++++++++++++++----------- locale/es/LC_MESSAGES/django.mo | Bin 0 -> 49713 bytes locale/es/LC_MESSAGES/django.po | 281 +++++++------ settings_local.py.dist | 2 +- templates/404.html | 8 +- templates/about.html | 11 +- templates/content/images/logo.png | Bin 4972 -> 3631 bytes templates/content/images/originals/logo.svg | 119 ------ templates/content/style/style.css | 13 +- templates/faq.html | 4 +- templates/header.html | 13 +- templates/index.html | 8 +- templates/question.html | 2 +- templates/user_stats.html | 84 +--- templates/user_tabs.html | 2 +- templates/users_questions.html | 30 +- 21 files changed, 580 insertions(+), 618 deletions(-) create mode 100644 locale/es/LC_MESSAGES/django.mo delete mode 100644 templates/content/images/originals/logo.svg diff --git a/context.py b/context.py index c068332c..3da69f7b 100644 --- a/context.py +++ b/context.py @@ -10,6 +10,7 @@ def application_settings(context): 'LANGUAGE_CODE': settings.LANGUAGE_CODE, 'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE, 'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY, + 'BOOKS_ON':settings.BOOKS_ON, } return {'settings':my_settings} diff --git a/django_authopenid/views.py b/django_authopenid/views.py index 218a31a2..d055396b 100644 --- a/django_authopenid/views.py +++ b/django_authopenid/views.py @@ -555,6 +555,8 @@ def send_new_email_key(user,nomessage=False): import random random.seed() user.email_key = '%032x' % random.getrandbits(128) + print len(user.email_key) + print user.email_key user.save() _send_email_key(user) if nomessage==False: diff --git a/forum/models.py b/forum/models.py index 9060b436..f647ba12 100644 --- a/forum/models.py +++ b/forum/models.py @@ -183,7 +183,7 @@ class Question(models.Model): return u','.join([unicode(tag) for tag in self.tagname_list()]) def get_absolute_url(self): - return '%s%s' % (reverse('question', args=[self.id]), self.title.replace(' ', '-')) + return '%s%s' % (reverse('question', args=[self.id]), slugify(self.title)) def has_favorite_by_user(self, user): if not user.is_authenticated(): @@ -303,7 +303,7 @@ class QuestionRevision(models.Model): return self.question.title def get_absolute_url(self): - return '/questions/%s/revisions' % (self.question.id) + return '/%s%s/%s' % (_('questions/'),self.question.id,_('revisions')) def save(self, **kwargs): """Looks up the next available revision number.""" @@ -415,7 +415,7 @@ class AnswerRevision(models.Model): text = models.TextField() def get_absolute_url(self): - return '/answers/%s/revisions' % (self.answer.id) + return '/%s%s/%s' % (_('answers/'),self.answer.id,_('revisions')) def get_question_title(self): return self.answer.question.title @@ -587,7 +587,7 @@ QUESTIONS_PER_PAGE_CHOICES = ( ) User.add_to_class('email_isvalid', models.BooleanField(default=False)) -User.add_to_class('email_key', models.CharField(max_length=16, null=True)) +User.add_to_class('email_key', models.CharField(max_length=32, null=True)) User.add_to_class('reputation', models.PositiveIntegerField(default=1)) User.add_to_class('gravatar', models.CharField(max_length=32)) User.add_to_class('email_feeds', generic.GenericRelation(EmailFeed)) @@ -629,7 +629,7 @@ def delete_messages(self): def get_profile_url(self): """Returns the URL for this User's profile.""" - return '%s%s/' % (reverse('user', args=[self.id]), self.username) + return '%s%s/' % (reverse('user', args=[self.id]), slugify(self.username)) User.add_to_class('get_profile_url', get_profile_url) User.add_to_class('get_messages', get_messages) User.add_to_class('delete_messages', delete_messages) diff --git a/forum/views.py b/forum/views.py index 626c93a3..89d0cbfd 100644 --- a/forum/views.py +++ b/forum/views.py @@ -332,7 +332,7 @@ def question(request, id): answers = answers.select_related(depth=1) favorited = question.has_favorite_by_user(request.user) - if not request.user.is_anonymous(): + if request.user.is_authenticated(): question_vote = question.votes.select_related().filter(user=request.user) else: question_vote = None #is this correct? diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 11d15deb..447afac4 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 07532566..ff280947 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-05 22:26-0400\n" +"POT-Creation-Date: 2009-08-12 15:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,16 +16,145 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: settings.py:12 +#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698 msgid "account/" msgstr "" -#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:10 -#: django_authopenid/urls.py:11 django_authopenid/urls.py:13 -#: forum/views.py:304 templates/authopenid/confirm_email.txt:10 +#: settings.py:12 urls.py:26 django_authopenid/urls.py:9 +#: django_authopenid/urls.py:10 django_authopenid/urls.py:11 +#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699 +#: templates/authopenid/confirm_email.txt:10 msgid "signin/" msgstr "" +#: urls.py:22 +msgid "upfiles/" +msgstr "" + +#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26 +#: django_authopenid/urls.py:27 +msgid "email/" +msgstr "" + +#: urls.py:27 +msgid "change/" +msgstr "" + +#: urls.py:28 +msgid "sendkey/" +msgstr "" + +#: urls.py:29 +msgid "verify/" +msgstr "" + +#: urls.py:30 +msgid "about/" +msgstr "" + +#: urls.py:31 +msgid "faq/" +msgstr "" + +#: urls.py:32 +msgid "privacy/" +msgstr "" + +#: urls.py:33 +msgid "logout/" +msgstr "" + +#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418 +msgid "answers/" +msgstr "" + +#: urls.py:34 urls.py:46 +msgid "comments/" +msgstr "" + +#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34 +msgid "edit/" +msgstr "" + +#: urls.py:36 urls.py:45 +msgid "revisions/" +msgstr "" + +#: 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:306 forum/views.py:1416 +msgid "questions/" +msgstr "" + +#: urls.py:38 urls.py:64 +msgid "ask/" +msgstr "" + +#: urls.py:39 +msgid "unanswered/" +msgstr "" + +#: urls.py:41 +msgid "close/" +msgstr "" + +#: urls.py:42 +msgid "reopen/" +msgstr "" + +#: urls.py:43 +msgid "answer/" +msgstr "" + +#: urls.py:44 +msgid "vote/" +msgstr "" + +#: urls.py:47 urls.py:48 django_authopenid/urls.py:29 +msgid "delete/" +msgstr "" + +#: urls.py:50 +msgid "question/" +msgstr "" + +#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013 +msgid "tags/" +msgstr "" + +#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997 +#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015 +msgid "users/" +msgstr "" + +#: urls.py:56 urls.py:57 +msgid "badges/" +msgstr "" + +#: urls.py:58 +msgid "messages/" +msgstr "" + +#: urls.py:58 +msgid "markread/" +msgstr "" + +#: urls.py:60 +msgid "nimda/" +msgstr "" + +#: urls.py:62 +msgid "upload/" +msgstr "" + +#: urls.py:63 urls.py:64 urls.py:65 +msgid "books/" +msgstr "" + +#: urls.py:66 +msgid "search/" +msgstr "" + #: django_authopenid/forms.py:67 django_authopenid/views.py:102 msgid "i-names are not supported" msgstr "" @@ -109,7 +238,7 @@ msgstr "" msgid "Incorrect username." msgstr "" -#: django_authopenid/urls.py:10 +#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699 msgid "newquestion/" msgstr "" @@ -137,8 +266,8 @@ msgstr "" msgid "sendpw/" msgstr "" -#: django_authopenid/urls.py:29 -msgid "delete/" +#: django_authopenid/urls.py:27 +msgid "validate/" msgstr "" #: django_authopenid/views.py:108 @@ -146,69 +275,69 @@ msgstr "" msgid "OpenID %(openid_url)s is invalid" msgstr "" -#: django_authopenid/views.py:417 django_authopenid/views.py:544 +#: django_authopenid/views.py:418 django_authopenid/views.py:545 msgid "Welcome" msgstr "Verification Email from Q&A forum" -#: django_authopenid/views.py:507 +#: django_authopenid/views.py:508 msgid "Password changed." msgstr "" -#: django_authopenid/views.py:519 django_authopenid/views.py:524 +#: django_authopenid/views.py:520 django_authopenid/views.py:525 msgid "your email needs to be validated" msgstr "" "Your email needs to be validated. Please see details here." -#: django_authopenid/views.py:681 django_authopenid/views.py:833 +#: django_authopenid/views.py:682 django_authopenid/views.py:834 #, python-format msgid "No OpenID %s found associated in our database" msgstr "" -#: django_authopenid/views.py:685 django_authopenid/views.py:840 +#: django_authopenid/views.py:686 django_authopenid/views.py:841 #, python-format msgid "The OpenID %s isn't associated to current user logged in" msgstr "" -#: django_authopenid/views.py:693 +#: django_authopenid/views.py:694 msgid "Email Changed." msgstr "" -#: django_authopenid/views.py:768 +#: django_authopenid/views.py:769 msgid "This OpenID is already associated with another account." msgstr "" -#: django_authopenid/views.py:773 +#: django_authopenid/views.py:774 #, python-format msgid "OpenID %s is now associated with your account." msgstr "" -#: django_authopenid/views.py:843 +#: django_authopenid/views.py:844 msgid "Account deleted." msgstr "" -#: django_authopenid/views.py:883 +#: django_authopenid/views.py:884 msgid "Request for new password" msgstr "" -#: django_authopenid/views.py:896 +#: django_authopenid/views.py:897 msgid "A new password has been sent to your email address." msgstr "" -#: django_authopenid/views.py:926 +#: django_authopenid/views.py:927 #, python-format msgid "" "Could not change password. Confirmation key '%s' is not " "registered." msgstr "" -#: django_authopenid/views.py:935 +#: django_authopenid/views.py:936 msgid "" "Can not change password. User don't exist anymore in our " "database." msgstr "" -#: django_authopenid/views.py:944 +#: django_authopenid/views.py:945 #, python-format msgid "Password changed for %s. You may now sign in." msgstr "" @@ -337,12 +466,8 @@ msgstr "" msgid "latest questions" msgstr "" -#: forum/feed.py:19 -msgid "questions/" -msgstr "" - -#: forum/forms.py:14 templates/answer_edit_tips.html:34 -#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31 +#: forum/forms.py:14 templates/answer_edit_tips.html:33 +#: templates/answer_edit_tips.html.py:37 templates/question_edit_tips.html:31 #: templates/question_edit_tips.html:36 msgid "title" msgstr "" @@ -363,7 +488,7 @@ msgstr "" msgid "question content must be > 10 characters" msgstr "" -#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:61 +#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:64 msgid "tags" msgstr "" @@ -390,8 +515,8 @@ msgid "" "characters '.-_#'" msgstr "" -#: forum/forms.py:75 templates/index.html:57 templates/question.html:199 -#: templates/question.html.py:380 templates/questions.html:58 +#: forum/forms.py:75 templates/index.html:57 templates/question.html:209 +#: templates/question.html.py:395 templates/questions.html:58 #: templates/questions.html.py:70 templates/unanswered.html:48 #: templates/unanswered.html.py:60 msgid "community wiki" @@ -445,40 +570,44 @@ msgstr "" msgid "this email has already been registered, please use another one" msgstr "" -#: forum/models.py:238 +#: forum/models.py:246 #, python-format msgid "%(author)s modified the question" msgstr "" -#: forum/models.py:242 +#: forum/models.py:250 #, python-format msgid "%(people)s posted %(new_answer_count)s new answers" msgstr "" -#: forum/models.py:247 +#: forum/models.py:255 #, python-format msgid "%(people)s commented the question" msgstr "" -#: forum/models.py:252 +#: forum/models.py:260 #, python-format msgid "%(people)s commented answers" msgstr "" -#: forum/models.py:254 +#: forum/models.py:262 #, python-format -msgid "%(people)s commented the answer" +msgid "%(people)s commented an answer" msgstr "" -#: forum/models.py:433 templates/badges.html:52 +#: forum/models.py:306 forum/models.py:418 +msgid "revisions" +msgstr "" + +#: forum/models.py:441 templates/badges.html:51 msgid "gold" msgstr "" -#: forum/models.py:434 templates/badges.html:60 +#: forum/models.py:442 templates/badges.html:59 msgid "silver" msgstr "" -#: forum/models.py:435 templates/badges.html:67 +#: forum/models.py:443 templates/badges.html:66 msgid "bronze" msgstr "" @@ -566,31 +695,27 @@ msgstr "" msgid "profile - user preferences" msgstr "" -#: forum/views.py:304 -msgid "/account/" -msgstr "" - -#: forum/views.py:943 +#: forum/views.py:947 #, python-format msgid "subscription saved, %(email)s needs validation" msgstr "" "Your subscription is saved, but email address %(email)s needs to be " "validated, please see more details here" -#: forum/views.py:1853 +#: forum/views.py:1860 msgid "uploading images is limited to users with >60 reputation points" msgstr "" -#: forum/views.py:1855 +#: forum/views.py:1862 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'" msgstr "" -#: forum/views.py:1857 +#: forum/views.py:1864 #, python-format msgid "maximum upload file size is %sK" msgstr "" -#: forum/views.py:1859 +#: forum/views.py:1866 #, python-format msgid "" "Error uploading file. Please contact the site administrator. Thank you. %s" @@ -600,16 +725,16 @@ msgstr "" msgid "updates from website" msgstr "" -#: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168 -#: templates/header.html:33 +#: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172 +#: templates/header.html:35 msgid "badges" msgstr "" -#: forum/templatetags/extra_tags.py:140 forum/templatetags/extra_tags.py:167 +#: forum/templatetags/extra_tags.py:144 forum/templatetags/extra_tags.py:171 msgid "reputation points" msgstr "" -#: forum/templatetags/extra_tags.py:221 +#: forum/templatetags/extra_tags.py:225 msgid " ago" msgstr "" @@ -684,13 +809,13 @@ msgid "Edit answer" msgstr "" #: templates/answer_edit.html:24 templates/answer_edit.html.py:27 -#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40 -#: templates/question.html.py:43 templates/question_edit.html:27 +#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:43 +#: templates/question.html.py:46 templates/question_edit.html:27 msgid "hide preview" msgstr "" #: templates/answer_edit.html:27 templates/ask.html:28 -#: templates/question.html:43 templates/question_edit.html:27 +#: templates/question.html:46 templates/question_edit.html:27 msgid "show preview" msgstr "" @@ -710,22 +835,22 @@ msgid "select revision" msgstr "" #: templates/answer_edit.html:62 templates/ask.html:94 -#: templates/question.html:452 templates/question_edit.html:91 +#: templates/question.html:467 templates/question_edit.html:91 msgid "Toggle the real time Markdown editor preview" msgstr "" #: templates/answer_edit.html:62 templates/ask.html:94 -#: templates/question.html:452 templates/question_edit.html:91 +#: templates/question.html:467 templates/question_edit.html:91 msgid "toggle preview" msgstr "" -#: templates/answer_edit.html:73 templates/question_edit.html:119 -#: templates/question_retag.html:75 +#: templates/answer_edit.html:71 templates/question_edit.html:115 +#: templates/question_retag.html:73 msgid "Save edit" msgstr "" -#: templates/answer_edit.html:74 templates/close.html:29 -#: templates/question_edit.html:120 templates/question_retag.html:76 +#: templates/answer_edit.html:72 templates/close.html:29 +#: templates/question_edit.html:116 templates/question_retag.html:74 #: templates/reopen.html:30 templates/user_edit.html:83 #: templates/authopenid/changeemail.html:34 msgid "Cancel" @@ -755,40 +880,40 @@ msgstr "" msgid "see frequently asked questions" msgstr "" -#: templates/answer_edit_tips.html:25 templates/question_edit_tips.html:22 +#: templates/answer_edit_tips.html:24 templates/question_edit_tips.html:22 msgid "Markdown tips" msgstr "Markdown basics" -#: templates/answer_edit_tips.html:28 templates/question_edit_tips.html:25 +#: templates/answer_edit_tips.html:27 templates/question_edit_tips.html:25 msgid "*italic* or __italic__" msgstr "" -#: templates/answer_edit_tips.html:31 templates/question_edit_tips.html:28 +#: templates/answer_edit_tips.html:30 templates/question_edit_tips.html:28 msgid "**bold** or __bold__" msgstr "" -#: templates/answer_edit_tips.html:34 templates/question_edit_tips.html:31 +#: templates/answer_edit_tips.html:33 templates/question_edit_tips.html:31 msgid "link" msgstr "" -#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:38 +#: templates/answer_edit_tips.html:33 templates/answer_edit_tips.html.py:37 #: templates/question_edit_tips.html:31 templates/question_edit_tips.html:36 msgid "text" msgstr "" -#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36 +#: templates/answer_edit_tips.html:37 templates/question_edit_tips.html:36 msgid "image" msgstr "" -#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40 +#: templates/answer_edit_tips.html:41 templates/question_edit_tips.html:40 msgid "numbered list:" msgstr "" -#: templates/answer_edit_tips.html:47 templates/question_edit_tips.html:45 +#: templates/answer_edit_tips.html:46 templates/question_edit_tips.html:45 msgid "basic HTML tags are also supported" msgstr "" -#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48 +#: templates/answer_edit_tips.html:49 templates/question_edit_tips.html:48 msgid "learn more about Markdown" msgstr "" @@ -816,15 +941,15 @@ msgstr "" "your question now and validate email after that. Your question will saved as " "pending meanwhile. " -#: templates/ask.html:108 +#: templates/ask.html:107 msgid "(required)" msgstr "" -#: templates/ask.html:115 +#: templates/ask.html:114 msgid "Login/signup to post your question" msgstr "Login/Signup to Post" -#: templates/ask.html:117 +#: templates/ask.html:116 msgid "Ask your question" msgstr "Ask Your Question" @@ -840,7 +965,7 @@ msgstr "" msgid "Badges summary" msgstr "" -#: templates/badges.html:17 templates/user_stats.html:113 +#: templates/badges.html:17 templates/user_stats.html:115 msgid "Badges" msgstr "" @@ -862,27 +987,27 @@ msgstr "" "a>       - what kinds of badges would you like to see and suggest the " "activity for which those badges might be awarded." -#: templates/badges.html:49 +#: templates/badges.html:48 msgid "Community badges" msgstr "Badge levels" -#: templates/badges.html:55 +#: templates/badges.html:54 msgid "gold badge description" msgstr "" "Gold badge is the highest award in this community. To obtain it have to show " "profound knowledge and ability in addition to your active participation." -#: templates/badges.html:63 +#: templates/badges.html:62 msgid "silver badge description" msgstr "" "Obtaining silver badge requires significant patience. If you have received " "one, that means you have greatly contributed to this community." -#: templates/badges.html:66 +#: templates/badges.html:65 msgid "bronze badge: often given as a special honor" msgstr "" -#: templates/badges.html:70 +#: templates/badges.html:69 msgid "bronze badge description" msgstr "" "If you are an active participant in this community, you will be recognized " @@ -968,11 +1093,10 @@ msgstr "" msgid "views" msgstr "" -#: templates/book.html:125 templates/index.html:69 templates/question.html:115 -#: templates/question.html.py:486 templates/questions.html:84 -#: templates/questions.html.py:156 templates/tags.html:47 -#: templates/unanswered.html:75 templates/unanswered.html.py:109 -#: templates/users_questions.html:52 +#: templates/book.html:125 templates/index.html:69 templates/question.html:499 +#: templates/questions.html:84 templates/questions.html.py:156 +#: templates/tags.html:49 templates/unanswered.html:75 +#: templates/unanswered.html.py:106 templates/users_questions.html:52 msgid "using tags" msgstr "" @@ -980,7 +1104,7 @@ msgstr "" msgid "subscribe to book RSS feed" msgstr "" -#: templates/book.html:147 templates/index.html:116 +#: templates/book.html:147 templates/index.html:118 msgid "subscribe to the questions feed" msgstr "" @@ -1036,10 +1160,6 @@ msgstr "" msgid "What should I avoid in my answers?" msgstr "" -#: templates/faq.html:28 templates/faq.html.py:132 -msgid "site title" -msgstr "" - #: templates/faq.html:28 msgid "" "is a Q&A site, not a discussion group. Therefore - please avoid having " @@ -1081,61 +1201,72 @@ msgstr "" "rough measure of the community trust to him/her. Various moderation tasks " "are gradually assigned to the users based on those points." -#: templates/faq.html:59 templates/user_votes.html:14 +#: templates/faq.html:42 +msgid "" +"For example, if you ask an interesting question or give a helpful answer, " +"your input will be upvoted. On the other hand if the answer is misleading - " +"it will be downvoted. Each vote in favor will generate 10 " +"points, each vote against will subtract 2 points. There is " +"a limit of 200 points that can be accumulated per question " +"or answer. The table below explains reputation point requirements for each " +"type of moderation task." +msgstr "" + +#: templates/faq.html:53 templates/user_votes.html:14 msgid "upvote" msgstr "" -#: templates/faq.html:63 +#: templates/faq.html:57 msgid "use tags" msgstr "" -#: templates/faq.html:68 +#: templates/faq.html:62 msgid "add comments" msgstr "" -#: templates/faq.html:72 templates/user_votes.html:16 +#: templates/faq.html:66 templates/user_votes.html:16 msgid "downvote" msgstr "" -#: templates/faq.html:75 +#: templates/faq.html:69 msgid "open and close own questions" msgstr "" -#: templates/faq.html:79 +#: templates/faq.html:73 msgid "retag questions" msgstr "" -#: templates/faq.html:83 +#: templates/faq.html:77 msgid "edit community wiki questions" msgstr "" -#: templates/faq.html:87 +#: templates/faq.html:81 msgid "edit any answer" msgstr "" -#: templates/faq.html:91 +#: templates/faq.html:85 msgid "open any closed question" msgstr "" -#: templates/faq.html:95 +#: templates/faq.html:89 msgid "delete any comment" msgstr "" -#: templates/faq.html:99 +#: templates/faq.html:93 msgid "delete any questions and answers and perform other moderation tasks" msgstr "" -#: templates/faq.html:106 +#: templates/faq.html:100 msgid "how to validate email title" msgstr "How to validate email and why?" -#: templates/faq.html:108 +#: templates/faq.html:102 msgid "how to validate email info" msgstr "" "

      How? If you have just set or changed your email " -"address - check your email and click the included link." -"
      The link contains a key generated specifically for you. You can also " +"address - check your email and click the included link.
      The link contains a key generated specifically for you. You can also " "

       @@ -52,7 +53,7 @@
      -
      - {% trans "ask a question" %} -
      - {% trans "questions" %} {% trans "tags" %} {% trans "users" %} - + {% if settings.BOOKS_ON %} + {% trans "books" %} + {% endif %} {% trans "badges" %} {% trans "unanswered questions" %} @@ -42,6 +40,9 @@ {% trans "my profile" %} {% endif %} {% endcomment %} +
      + {% trans "ask a question" %} +
      -
      +
      diff --git a/templates/index.html b/templates/index.html index b358c384..104b24d0 100644 --- a/templates/index.html +++ b/templates/index.html @@ -21,9 +21,9 @@
      {% trans "Questions" %}
      - {% trans "newest" %} - {% trans "hottest" %} - {% trans "most voted" %} + {% trans "newest" %} + {% trans "hottest" %} + {% trans "most voted" %} {% trans "all questions" %}
      @@ -93,7 +93,7 @@ {% endfor %} -

      +
      {% trans "popular tags" %} »
      diff --git a/templates/question.html b/templates/question.html index 0e1b8cb2..13d283ed 100644 --- a/templates/question.html +++ b/templates/question.html @@ -122,7 +122,7 @@
      {% for tag in question.tagname_list %} + title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }} {% endfor %}
      diff --git a/templates/user_stats.html b/templates/user_stats.html index 7313fac3..07578cb7 100644 --- a/templates/user_stats.html +++ b/templates/user_stats.html @@ -7,85 +7,51 @@ {% block usercontent %} - - - - - -
      -
      {{questions|length}}
      -       		-

      {% trans "User questions" %}

      -
      +

      {{questions|length}} {% trans "User questions" %}

      {% include "users_questions.html" %} -

       

      - - - - - -
      -
      {{answered_questions|length}}
      -       		-

      {% trans "Answers" %}

      -
      +

      {{answered_questions|length}} {% trans "Answers" %}

      {% for answered_question in answered_questions %}
      - -
      + + {{ answered_question.vote_count }} -
      +
      - {{answered_question.title}} {% if answered_question.comment_count %}({{answered_question.comment_count}}){% endif %} + {{answered_question.title}} + {% if answered_question.comment_count %} + + {% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %} + + {% endif %}
      {% endfor %}
      -

       

      - - - - - -
      -
      {{total_votes}}
      -       		-

      {% trans "votes total" %}

      -
      +

      {{total_votes}} {% trans "Votes" %}

      - +
      - + {% trans {{up_votes}} - + {% trans {{down_votes}}
      -

       

      - - - - - -
      -
      {{tags|length}}
      -       		-

      {% trans "Tags" %}

      -
      +

      {{tags|length}} {% trans "Tags" %}

      @@ -103,24 +69,14 @@
      -

       

      - - - - - -
      -
      {{total_awards}}
      -       		-

      {% trans "Badges" %}

      -
      +

      {{total_awards}} {% trans "Badges" %}

      {% for award in awards %} - ● {{ award.name }} × {{ award.count|intcomma }}
      + ● {{ award.name }} ✕ {{ award.count|intcomma }}
      {% if forloop.counter|divisibleby:"6" %}       		diff --git a/templates/user_tabs.html b/templates/user_tabs.html index 96cc5aca..cb7e1d2f 100644 --- a/templates/user_tabs.html +++ b/templates/user_tabs.html @@ -20,7 +20,7 @@ title="{% trans "user vote record" %}" href="{% url users %}{{view_user.id}}/{{view_user.username}}?sort=votes">{% trans "casted votes" %} {% endif %} {% trans "favorites" %} {% if request.user|can_view_user_preferences:view_user %} + alt="{% trans "thumb-up on" %}" + src="/content/images/vote-favorite-on.png"/>
      {{question.favourite_count|intcomma}}
      {% else %}
      + alt="{% trans "thumb-up off" %}" + src="/content/images/vote-favorite-off.png"/>
      {{question.favourite_count|intcomma}}
      {% endif %} @@ -24,22 +26,22 @@ {% endif %}       -
      +
      {% endfor %} -- cgit v1.2.3-1-g7c22 From 9baa1cf76ca8dd053329377d89cbce69b32c4b0c Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 12 Aug 2009 15:48:15 -0400 Subject: Added Adolfo's canonical url link fix --- django_authopenid/views.py | 2 -- templates/question.html | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/django_authopenid/views.py b/django_authopenid/views.py index d055396b..218a31a2 100644 --- a/django_authopenid/views.py +++ b/django_authopenid/views.py @@ -555,8 +555,6 @@ def send_new_email_key(user,nomessage=False): import random random.seed() user.email_key = '%032x' % random.getrandbits(128) - print len(user.email_key) - print user.email_key user.save() _send_email_key(user) if nomessage==False: diff --git a/templates/question.html b/templates/question.html index 13d283ed..66713342 100644 --- a/templates/question.html +++ b/templates/question.html @@ -8,7 +8,7 @@ {% block forejs %} - + {% if not question.closed and request.user.is_authenticated %} -- cgit v1.2.3-1-g7c22 From 13611098c91cb62090b5fc608082ef4c08a50176 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 13 Aug 2009 13:16:46 -0400 Subject: added temp Awards aggregation fix, and fixed url in views.py --- forum/views.py | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/forum/views.py b/forum/views.py index 89d0cbfd..d663a4cb 100644 --- a/forum/views.py +++ b/forum/views.py @@ -16,6 +16,7 @@ from django.core import serializers from django.db import transaction from django.contrib.contenttypes.models import ContentType from django.utils.translation import ugettext as _ +from django.template.defaultfilters import slugify from utils.html import sanitize_html from markdown2 import Markdown @@ -1129,15 +1130,27 @@ def user_stats(request, user_id, user_view): votes_today = Vote.objects.get_votes_count_today_from_user(user) votes_total = VOTE_RULES['scope_votes_per_user_per_day'] tags = user.created_tags.all().order_by('-used_count')[:50] - awards = Award.objects.extra( - select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'}, - tables=['award', 'badge'], - order_by=['-awarded_at'], - where=['user_id=%s AND badge_id=badge.id'], - params=[user.id] - ).values('id', 'count', 'name', 'description', 'type') - total_awards = awards.count() - awards.query.group_by = ['badge_id'] + if settings.DJANGO_VERSION < 1.1: + awards = Award.objects.extra( + select={'id': 'badge.id', 'count': 'count(badge_id)', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'}, + tables=['award', 'badge'], + order_by=['-awarded_at'], + where=['user_id=%s AND badge_id=badge.id'], + params=[user.id] + ).values('id', 'count', 'name', 'description', 'type') + total_awards = awards.count() + awards.query.group_by = ['badge_id'] + else: + awards = Award.objects.extra( + select={'id': 'badge.id', 'name':'badge.name', 'description': 'badge.description', 'type': 'badge.type'}, + tables=['award', 'badge'], + order_by=['-awarded_at'], + where=['user_id=%s AND badge_id=badge.id'], + params=[user.id] + ).values('id', 'name', 'description', 'type') + total_awards = awards.count() + from django.db.models import Count + awards = awards.annotate(count = Count('badge__id')) return render_to_response(user_view.template_file,{ "tab_name" : user_view.id, @@ -1170,10 +1183,11 @@ def user_recent(request, user_id, user_view): self.type_id = type self.title = title self.summary = summary + slug_title = slugify(title) if int(answer_id) > 0: - self.title_link = u'/questions/%s/%s#%s' %(question_id, title, answer_id) + self.title_link = u'/%s%s/%s#%s' %(_('questions/'),question_id, slug_title, answer_id) else: - self.title_link = u'/questions/%s/%s' %(question_id, title) + self.title_link = u'/%s%s/%s' %(_('questions/'),question_id, slug_title) class AwardEvent: def __init__(self, time, type, id): -- cgit v1.2.3-1-g7c22