From a7a5d993c680a2fa2a541951d99742090a716807 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Thu, 23 Jul 2009 01:18:20 -0300
Subject: Spanish translation.  * Still some bits left like capital letters and
 maybe some errors of context of texts.  * Need to fix JS to work, will do
 later.  * Need to modify some variables

---
 locale/es/LC_MESSAGES/django.po | 721 ++++++++++++++++++++++------------------
 1 file changed, 393 insertions(+), 328 deletions(-)

(limited to 'locale')

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b26bde1a..fe0aab7c 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-20 02:06-0300\n"
+"POT-Creation-Date: 2009-07-23 01:11-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -459,7 +459,8 @@ msgstr "Fecha de nacimiento"
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD"
 
-#: forum/forms.py:165 templates/authopenid/settings.html:20
+#: forum/forms.py:165 templates/base.html:64
+#: templates/authopenid/settings.html:20
 msgid "Profile"
 msgstr "Perfil"
 
@@ -824,15 +825,14 @@ msgid "Badges"
 msgstr "Distinciones"
 
 #: templates/badges.html:21
-#, fuzzy
 msgid ""
 "Community gives you awards for your questions, answers and votes. Below is "
 "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."
+"votos. Debajo esta la lista de las distinciones disponibles y la cantidad de "
+"veces que han sido asignadas."
 
 #: templates/badges.html:48
 msgid "Community badges"
@@ -859,108 +859,119 @@ msgstr ""
 #: templates/badges.html:65
 msgid "bronze badge: often given as a special honor"
 msgstr ""
-"distinción de bronce: con frecuencia entregada como reconocimiento "
-"especial."
+"distinción de bronce: con frecuencia entregada como reconocimiento especial."
 
 #: templates/badges.html:69
 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, recibiras esta "
-
-#: templates/base.html:60 templates/base_content.html:61
-msgid "congratulations, community gave you a badge"
+"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:62 templates/base_content.html:63
-msgid "profile"
-msgstr ""
+#: templates/base.html:62
+#, fuzzy
+msgid "Congratulations! You have new badges: "
+msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
+
+#: templates/base.html:63
+#, fuzzy
+msgid "go to see"
+msgstr "OK para cerrar"
+
+#: templates/base_content.html:61
+msgid "congratulations, community gave you a badge"
+msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
 
 #: templates/base_content.html:62
 msgid "see"
-msgstr ""
+msgstr "ver"
+
+#: templates/base_content.html:63
+msgid "profile"
+msgstr "perfil"
 
 #: 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/questions.html:46
 #: templates/unanswered.html:37 templates/users_questions.html:30
 #: templates/tough/unanswered.html:35
 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/questions.html:47
 #: templates/unanswered.html:38 templates/users_questions.html:40
 #: templates/tough/unanswered.html:36
 msgid "views"
-msgstr ""
+msgstr "vistas"
 
 #: templates/book.html:125 templates/index.html:68 templates/question.html:112
 #: templates/question.html.py:479 templates/questions.html:84
@@ -969,65 +980,71 @@ msgstr ""
 #: templates/users_questions.html:52 templates/tough/unanswered.html:72
 #: templates/tough/unanswered.html:105
 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:116
 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/faq.html:11 templates/tough/faq.html:9
 msgid "Frequently Asked Questions "
-msgstr ""
+msgstr "Preguntas Frecuentes"
 
 #: templates/faq.html:15 templates/tough/faq.html:13
 msgid "What kinds of questions can I ask here?"
-msgstr ""
+msgstr "¿Qué clase de preguntas puedo hacer aquí?"
 
 #: templates/faq.html:16 templates/tough/faq.html:14
 msgid ""
 "Most importanly - questions should be <strong>relevant</strong> to this "
 "community."
 msgstr ""
+"Por encima de todo - las preguntas deben ser <strong>relevantes</strong>a "
+"esta comunidad."
 
 #: templates/faq.html:17 templates/tough/faq.html:15
 msgid ""
 "Before asking the question - please make sure to use search to see whether "
 "your question has alredy been answered."
 msgstr ""
+"Antes de hacer tu pregunta - por favor usa el buscador para asegurarte que "
+"la pregunta no este ya hecha."
 
 #: templates/faq.html:20 templates/tough/faq.html:18
 msgid "What questions should I avoid asking?"
-msgstr ""
+msgstr "¿Qué preguntas debería evitar preguntar?"
 
 #: templates/faq.html:21 templates/tough/faq.html:19
 msgid ""
 "Please avoid asking questions that are not relevant to this community, too "
 "subjective and argumentative."
 msgstr ""
+"Evita hacer preguntas que no son relevantes a la comunidad, demasiado "
+"subjetivas o argumentativas."
 
 #: templates/faq.html:24 templates/tough/faq.html:22
 msgid "What should I avoid in my answers?"
-msgstr ""
+msgstr "¿Que debo evitar en mis respuestas?"
 
 #: templates/faq.html:25 templates/tough/faq.html:23
 msgid ""
@@ -1035,137 +1052,162 @@ msgid ""
 "discussions in your answers, comment facility allows some space for brief "
 "discussions."
 msgstr ""
+"es un sitio de Preguntas y Respuestas, no un grupo de discusión. Por ende, "
+"intenta evitar discusiones en tus respuestas. Los comentarios permiten "
+"realizar pequeñas discusiones."
 
 #: templates/faq.html:28 templates/tough/faq.html:26
 msgid "Who moderates this community?"
-msgstr ""
+msgstr "¿Quién modera esta comunidad?"
 
 #: templates/faq.html:29 templates/tough/faq.html:27
 msgid "The short answer is: <strong>you</strong>."
-msgstr ""
+msgstr "La respuesta corta es: <strong>tú</strong>"
 
 #: templates/faq.html:30 templates/tough/faq.html:28
 msgid "This website is moderated by the users."
-msgstr ""
+msgstr "Este sitio es moderado por los usuarios."
 
 #: templates/faq.html:31 templates/tough/faq.html:29
 msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
 msgstr ""
+"El sistema de reputación permite a los usuarios adquirir autorización para "
+"realizar diversas tareas de moderación."
 
 #: templates/faq.html:34 templates/tough/faq.html:32
 msgid "How does reputation system work?"
-msgstr ""
+msgstr "¿Cómo funciona el sistema de reputación?"
 
 #: templates/faq.html:35 templates/tough/faq.html:33
 msgid ""
 "Anyone can ask questions and give answers, points are not necessary for that."
 msgstr ""
+"Cualquier usuario puede hacer preguntas y dar respuestas, no es necesario "
+"tener reputación para ello."
 
 #: templates/faq.html:36 templates/tough/faq.html:34
 msgid ""
 "As we've said before, users help running this site. Point system helps "
 "select users who can administer this community."
 msgstr ""
+"Como dijimos antes, los usuarios ayudan a crear este sitio. El sistema de "
+"reputación permite seleccionar usuarios que pueden moderar esta comunidad."
 
 #: templates/faq.html:37 templates/tough/faq.html:35
 msgid ""
 "Reputation points roughly measure how community trusts you. These points are "
 "given to you directly by other members of the community."
 msgstr ""
+"Los puntos de reputación miden a groso modo que tan respetado eres en la "
+"comunidad. Los puntos son dados a ti directamente por otros miembros de la "
+"comunidad"
 
 #: templates/faq.html:40 templates/tough/faq.html:38
 msgid ""
 "For example, if you ask an interesting question or give a helpful answer, "
 "your input will be upvoted and you will gain more trust in the community."
 msgstr ""
+"Por ejemplo, si haces una pregunta interesante, o das una respuesta valiosa, "
+"tu entrada va a ser votada positivamente y tu ganarás confianza en la "
+"comunidad."
 
 #: templates/faq.html:41 templates/tough/faq.html:39
 msgid ""
 "If on the other hand someone gives a misleading answer, the answer will be "
 "voted down and he/she loses some points."
 msgstr ""
+"Si por el contrario, alguien da una respuesta que no corresponde, la "
+"respuesta será votada negativamente y el usuario perderá puntos."
 
 #: templates/faq.html:42 templates/tough/faq.html:40
 msgid ""
 "Each vote in favor will generate <strong>10</strong> points, each vote "
 "against will subtract <strong>2</strong> points."
 msgstr ""
+"Cada voto a favor generará <strong>10</strong> puntos, cada voto negativo "
+"restará <strong>2</strong> puntos."
 
 #: templates/faq.html:43 templates/tough/faq.html:41
 msgid ""
 "Through the votes of other people you can accumulate a maximum of "
 "<strong>200</strong> points."
 msgstr ""
+"A través del voto de otras personas puedes acumular un máximo de "
+"<strong>200</strong> puntos."
 
 #: templates/faq.html:44
 msgid "After accumulating certain number of points, you can do more:"
-msgstr ""
+msgstr "Luego de haber acumulado cierta cantidad de puntos, puedes hacer más:"
 
 #: templates/faq.html:52 templates/user_votes.html:14
 #: templates/tough/faq.html:50
 msgid "upvote"
-msgstr ""
+msgstr "votar positivo"
 
 #: templates/faq.html:56 templates/tough/faq.html:54
 msgid "use tags"
-msgstr ""
+msgstr "etiquetas usadas"
 
 #: templates/faq.html:60 templates/tough/faq.html:58
 msgid "add comments"
-msgstr ""
+msgstr "agregar comentarios"
 
 #: templates/faq.html:64 templates/user_votes.html:16
 #: templates/tough/faq.html:62
 msgid "downvote"
-msgstr ""
+msgstr "votar negativo"
 
 #: templates/faq.html:71 templates/tough/faq.html:69
 msgid "retag questions"
-msgstr ""
+msgstr "re-etiquetar preguntas"
 
 #: templates/faq.html:75 templates/tough/faq.html:73
 msgid "edit community wiki questions"
-msgstr ""
+msgstr "editar preguntas de la wiki comunitaria"
 
 #: templates/faq.html:79 templates/tough/faq.html:77
 msgid "edit any answer"
-msgstr ""
+msgstr "editar cualquier pregunta"
 
 #: templates/faq.html:83 templates/tough/faq.html:81
 msgid "open any closed question"
-msgstr ""
+msgstr "abrir cualquier pregunta cerrada"
 
 #: templates/faq.html:87 templates/tough/faq.html:85
 msgid "delete any comment"
-msgstr ""
+msgstr "borrar cualquier comentario"
 
 #: templates/faq.html:91 templates/tough/faq.html:89
 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:98
 msgid "To register, do I need to create new password?"
-msgstr ""
+msgstr "¿Para registrarme, debo crearme una cuenta?"
 
 #: templates/faq.html:99 templates/tough/faq.html:97
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
 msgstr ""
+"No tienes porqué. Puedes ingresar usando cualquiera de los servicios que "
+"soportan OpenID, ej. Google, Yahoo, AOL, MyOpenID, etc."
 
 #: templates/faq.html:100 templates/tough/faq.html:98
 msgid "Login now!"
-msgstr ""
+msgstr "Ingresa ahora!"
 
 #: templates/faq.html:103 templates/tough/faq.html:101
 msgid "Why other people can edit my questions/answers?"
-msgstr ""
+msgstr "¿Porqué otras personas pueden editar mis preguntas y respuestas?"
 
 #: templates/faq.html:104 templates/tough/faq.html:102
 msgid "Goal of this site is..."
-msgstr ""
+msgstr "El objetivo de este sitio es..."
 
 #: templates/faq.html:104 templates/tough/faq.html:102
 msgid ""
@@ -1173,18 +1215,22 @@ msgid ""
 "of this site and this improves the overall quality of the knowledge base "
 "content."
 msgstr ""
+"Entonces, las preguntas y respuestas pueden ser editadas como wiki por "
+"usuarios con experiencia, y esto mejora la calidad general del conocimiento "
+"guardado."
 
 #: templates/faq.html:105 templates/tough/faq.html:103
 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:107 templates/tough/faq.html:105
 msgid "Still have questions?"
-msgstr ""
+msgstr "¿Aún tienes preguntas?"
 
 #: templates/faq.html:108
 msgid "Please ask your question, help make our community better!"
-msgstr ""
+msgstr "Por favor haz tu pregunta, ¡ayudanos a mejorar nuestra comunidad!"
 
 #: templates/faq.html:108 templates/header.html:29 templates/header.html.py:60
 #: templates/tough/faq.html:106
@@ -1198,75 +1244,75 @@ msgstr ""
 
 #: templates/footer.html:7 templates/header.html:12 templates/index.html:83
 msgid "about"
-msgstr ""
+msgstr "acerca de"
 
 #: templates/footer.html:8 templates/header.html:13 templates/index.html:84
 msgid "faq"
-msgstr ""
+msgstr "preguntas frecuentes"
 
 #: templates/footer.html:9
 msgid "blog"
-msgstr ""
+msgstr "blog"
 
 #: templates/footer.html:10
 msgid "contact us"
-msgstr ""
+msgstr "contactenos"
 
 #: templates/footer.html:11
 msgid "privacy policy"
-msgstr ""
+msgstr "código de privacidad"
 
 #: templates/footer.html:12
 msgid "give feedback"
-msgstr ""
+msgstr "envía comentarios"
 
 #: templates/footer.html:18
 msgid "current revision"
-msgstr ""
+msgstr "revisión actual"
 
 #: 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:23
 msgid "back to home page"
-msgstr ""
+msgstr "volver al inicio"
 
 #: templates/header.html:31 templates/header.html.py:62
 msgid "users"
-msgstr ""
+msgstr "usuarios"
 
 #: templates/header.html:32
 msgid "books"
-msgstr ""
+msgstr "libros"
 
 #: templates/header.html:34 templates/index.html:121
 msgid "unanswered questions"
-msgstr "unanswered"
+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
 msgid "search"
-msgstr ""
+msgstr "buscar"
 
 #: templates/index.html:6
 msgid "Home"
-msgstr ""
+msgstr "Inicio"
 
 #: templates/index.html:7
 msgid "meta site keywords, comma separated"
-msgstr ""
+msgstr "palabras claves"
 
 #: templates/index.html:21 templates/questions.html:7
 msgid "Questions"
@@ -1274,38 +1320,38 @@ msgstr "Preguntas"
 
 #: templates/index.html:23
 msgid "last updated questions"
-msgstr ""
+msgstr "ultimas preguntas actualizadas"
 
 #: templates/index.html:23 templates/questions.html:25
 #: templates/unanswered.html:20 templates/tough/unanswered.html:18
 msgid "newest"
-msgstr ""
+msgstr "más nuevas"
 
 #: templates/index.html:24 templates/questions.html:27
 msgid "hottest questions"
-msgstr ""
+msgstr "preguntas más calientes"
 
 #: templates/index.html:24 templates/questions.html:27
 msgid "hottest"
-msgstr ""
+msgstr "más calientes"
 
 #: templates/index.html:25 templates/questions.html:28
 msgid "most voted questions"
-msgstr ""
+msgstr "preguntas más votadas"
 
 #: templates/index.html:25 templates/questions.html:28
 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/questions.html:45
 #: templates/unanswered.html:36 templates/users_questions.html:35
 #: templates/tough/unanswered.html:34
 msgid "answers"
-msgstr ""
+msgstr "respuestas"
 
 #: templates/index.html:68 templates/question.html:112
 #: templates/question.html.py:479 templates/questions.html:84
@@ -1314,211 +1360,216 @@ msgstr ""
 #: templates/users_questions.html:52 templates/tough/unanswered.html:72
 #: templates/tough/unanswered.html:105
 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:81
 msgid "what is this website"
-msgstr ""
+msgstr "que es este sitio"
 
 #: templates/index.html:82
 msgid "what can one do on this website"
-msgstr ""
+msgstr "que puede uno hacer en este sitio"
 
 #: templates/index.html:89
 msgid "Recent tags"
-msgstr ""
+msgstr "Etiquetas recientes"
 
 #: templates/index.html:94
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
-msgstr ""
+msgstr "ver preguntas etiquetadas '%(tagname)s'"
 
 #: templates/index.html:97 templates/index.html.py:121
 msgid "popular tags"
-msgstr ""
+msgstr "etiquetas populares"
 
 #: templates/index.html:101
 msgid "Recent awards"
-msgstr ""
+msgstr "Reconocimientos recientes"
 
 #: templates/index.html:107
 msgid "given to"
-msgstr ""
+msgstr "dados a"
 
 #: templates/index.html:112
 msgid "all awards"
-msgstr ""
+msgstr "todos los reconocimientos"
 
 #: templates/index.html:116
 msgid "subscribe to last 30 questions by RSS"
-msgstr ""
+msgstr "suscribirse a las últimas 30 preguntas por RSS"
 
 #: templates/index.html:121
 msgid "Still looking for more? See"
-msgstr ""
+msgstr "¿Aún sigues buscando más? Ver"
 
 #: templates/index.html:121
 msgid "complete list of quesionts"
-msgstr ""
+msgstr "lista completa de preguntas"
 
 #: templates/index.html:121
 msgid "or"
-msgstr ""
+msgstr "ó"
 
 #: templates/index.html:121
 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:6
 msgid "posts per page"
-msgstr ""
+msgstr "entradas por página"
 
 #: templates/paginator.html:6 templates/paginator.html.py:7
 msgid "previous"
-msgstr ""
+msgstr "previo"
 
 #: templates/paginator.html:20
 msgid "current page"
-msgstr ""
+msgstr "página actúal"
 
 #: templates/paginator.html:23 templates/paginator.html.py:30
 msgid "page number "
-msgstr ""
+msgstr "número de página"
 
 #: templates/paginator.html:23 templates/paginator.html.py:30
 msgid "number - make blank in english"
-msgstr ""
+msgstr " "
 
 #: templates/paginator.html:34
 msgid "next page"
-msgstr ""
+msgstr "próxima página"
 
 #: templates/privacy.html:6 templates/privacy.html.py:11
 msgid "Privacy policy"
-msgstr ""
+msgstr "Código de Privacidad"
 
 #: templates/privacy.html:15
 msgid "general message about privacy"
-msgstr ""
+msgstr "mensaje de privacidad"
 
 #: templates/privacy.html:18
 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
@@ -1526,79 +1577,81 @@ 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/user_stats.html:28
 msgid "Answers"
-msgstr " Answers"
+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 "oldest"
+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 "newest"
+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 "most voted"
+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
 msgid "Question tags"
@@ -1606,94 +1659,88 @@ msgstr "Etiquetas de la pregunta"
 
 #: templates/question.html:484
 msgid "question asked"
-msgstr "Asked"
+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 "Seen"
+msgstr "la pregunta fue vista"
 
 #: templates/question.html:487
 msgid "times"
-msgstr ""
+msgstr "veces"
 
 #: templates/question.html:490
 msgid "last updated"
-msgstr "Last updated"
+msgstr "última vez actualizada"
 
 #: templates/question.html:495
 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 "Tips"
+msgstr "sugerencias sobre pregunta"
 
 #: templates/question_edit_tips.html:7
 msgid "please ask a relevant question"
-msgstr ""
+msgstr "por favor hacer preguntas relevantes"
 
 #: templates/question_edit_tips.html:10
 msgid "please try provide enough details"
-msgstr "provide enough details"
+msgstr "intente proveer suficientes detalles"
 
 #: templates/questions.html:23
 msgid "Found by tags"
-msgstr "Tagged questions"
+msgstr "Encontradas por etiqueta"
 
 #: templates/questions.html:23
 msgid "Found by title"
-msgstr ""
+msgstr "Encontradas por titulo"
 
 #: templates/questions.html:23
 msgid "All questions"
-msgstr ""
+msgstr "Todas las preguntas"
 
 #: templates/questions.html:25 templates/unanswered.html:20
 #: templates/tough/unanswered.html:18
 msgid "most recently asked questions"
-msgstr ""
+msgstr "preguntas hechas más recientemente"
 
 #: templates/questions.html:26
 msgid "most recently updated questions"
-msgstr ""
+msgstr "preguntas actualizadas más recientemente"
 
 #: templates/questions.html:26
 msgid "active"
-msgstr ""
+msgstr "actividad"
 
 #: templates/questions.html:109
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
+"\t\t\thave total %(q_num)s question tagged %(tagname)s\n"
 "\t\t\t"
 msgid_plural ""
 "\n"
 "\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
 "\t\t\t"
-msgstr[0] ""
-"\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>question tagged</p><p><span "
-"class=\"tag\">%(tagname)s</span></p>"
-msgstr[1] ""
-"\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</"
-"p><p><span class=\"tag\">%(tagname)s</span></p>"
+msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
+msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
 
 #: templates/questions.html:116
 #, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\thave total %(q_num)s question containing %(searchtitle)s\n"
 "\t\t\t"
 msgid_plural ""
 "\n"
@@ -1701,42 +1748,41 @@ msgid_plural ""
 "\t\t\t"
 msgstr[0] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>question with title "
-"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
-"p>"
+"\t\t\thay un total de %(q_num)s preguntas que contienen %(searchtitle)s\n"
+"\t\t\t"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions with title "
-"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
-"p>"
+"\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n"
+"\t\t\t"
 
 #: templates/questions.html:124
 msgid "latest questions info"
-msgstr "<strong>Newest</strong> questions are shown first."
+msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
 #: templates/questions.html:128
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
+"Las preguntas estan ordenadas por <strong>fecha de último update</strong>."
 
 #: templates/questions.html:129
 msgid "Most recently answered ones are shown first."
-msgstr ""
+msgstr "Las más recientemente respondidas son mostradas primero."
 
 #: templates/questions.html:133
 msgid "Questions sorted by <strong>number of responses</strong>."
-msgstr ""
+msgstr "Preguntas ordenadas por <strong>número de respuestas</strong>."
 
 #: templates/questions.html:134
 msgid "Most answered questions are shown first."
-msgstr ""
+msgstr "Preguntas más respondidas aparecen primero."
 
 #: templates/questions.html:138
 msgid "Questions are sorted by the <strong>number of votes</strong>."
-msgstr ""
+msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>."
 
 #: templates/questions.html:139
 msgid "Most voted questions are shown first."
-msgstr ""
+msgstr "Las preguntas más votadas son mostradas primero."
 
 #: templates/questions.html:146 templates/unanswered.html:105
 #: templates/tough/unanswered.html:101
@@ -1745,108 +1791,108 @@ 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
 msgid "Revision history"
-msgstr ""
+msgstr "Historial de revisiones"
 
 #: templates/tags.html:6 templates/tags.html.py:29
 msgid "Tag list"
-msgstr ""
+msgstr "Lista de etiquetas"
 
 #: templates/tags.html:31
 msgid "sorted alphabetically"
-msgstr ""
+msgstr "ordenar alfabéticamente"
 
 #: templates/tags.html:31
 msgid "by name"
-msgstr ""
+msgstr "por nombre"
 
 #: templates/tags.html:32
 msgid "sorted by frequency of tag use"
-msgstr ""
+msgstr "ordenar por frecuencia de uso de la etiqueta"
 
 #: templates/tags.html:32
 msgid "by popularity"
-msgstr ""
+msgstr "por popularidad"
 
 #: templates/tags.html:38
 msgid "All tags matching query"
-msgstr ""
+msgstr "Todas las etiquetas que coincidan con la busqueda"
 
 #: templates/tags.html:38
 msgid "all tags - make this empty in english"
-msgstr ""
+msgstr "todas las tags"
 
 #: templates/tags.html:41
 msgid "Nothing found"
-msgstr ""
+msgstr "Nada encontrado"
 
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
 #: templates/tough/unanswered.html:5 templates/tough/unanswered.html.py:16
 msgid "Unanswered questions"
-msgstr ""
+msgstr "Preguntas sin respuesta"
 
 #: templates/unanswered.html:97
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
-"questions"
+"<div class=\"questions-count\">%(num_q)s</div> preguntas <strong>sin "
+"respuesta</strong> "
 
 #: templates/unanswered.html:99
 msgid "Have a total of"
-msgstr ""
+msgstr "Hay un total de"
 
 #: templates/user_edit.html:6
 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
 msgid "update profile"
@@ -1854,69 +1900,70 @@ msgstr ""
 
 #: 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 "Votes"
+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"
@@ -1925,64 +1972,64 @@ 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
 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
 msgid "favorites"
-msgstr ""
+msgstr "favoritos"
 
 #: templates/user_tabs.html:29
 msgid "settings"
-msgstr ""
+msgstr "preferencias"
 
 #: templates/users.html:6 templates/users.html.py:24
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: templates/users.html:27
 msgid "recent"
-msgstr ""
+msgstr "reciente"
 
 #: templates/users.html:28
 msgid "oldest"
-msgstr ""
+msgstr "más viejo"
 
 #: templates/users.html:29
 msgid "by username"
-msgstr ""
+msgstr "por nombre de usuario"
 
 #: templates/users.html:35
 #, python-format
 msgid "users matching query %(suser)s:"
-msgstr ""
+msgstr "usuarios que coincidan con la busqueda %(suser)s:"
 
 #: templates/users.html:39
 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 ""
@@ -1990,342 +2037,360 @@ 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 (<i>will be shown to others, cannot be modified</i>)"
 msgstr ""
+"Nombre de usuario (<i>será mostrado a otros, no puede ser modificado</i>)"
 
 #: templates/authopenid/complete.html:47
 msgid "Email (<i>not shared with anyone</i>)"
-msgstr ""
+msgstr "Email (<i>no será compartido con nadie</i>)"
 
 #: 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 ""
-"You can log in either through one of these services or traditionally - using "
-"local username/password."
+"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 "1) Please select your id service provider."
+msgstr "1) Selecciona tu proveedor de OpenID"
 
 #: templates/authopenid/signin.html:32
 msgid "verify openid link and login"
 msgstr ""
-"2) Please verify the OpenID URL (type your login name over {username}, if "
-"present) and then log in."
+"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 "With the OpenID you don't need to create new username and password."
+msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña."
 
 #: templates/authopenid/signin.html:79
 msgid "reuse openid"
-msgstr "You can safely re-use the same login for all OpenID-enabled websites."
+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 ""
-"There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
-"enabled."
+"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 is based on an open standard, supported by many organizations."
+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"
 
 #: templates/tough/question_retag.html:2
 msgid "Revise tags"
-msgstr ""
+msgstr "Revisar etiquetas"
 
 #: templates/tough/question_retag.html:37
 msgid "tags are requried"
-msgstr ""
+msgstr "las etiquetas son requeridas"
 
 #: templates/tough/question_retag.html:38
 msgid "up to 5 tags, less than 20 characters each"
-msgstr ""
+msgstr "hasta 5 etiquetas, menos de 20 caracteres cada una"
 
 #: templates/tough/question_retag.html:51
 msgid "Change tags"
-msgstr ""
+msgstr "Cambiar etiquetas"
 
 #: templates/tough/question_retag.html:74
 msgid "Change now"
-msgstr ""
+msgstr "Cambiar ahora"
 
 #: templates/tough/question_retag.html:85
 msgid "Why use and modify tags?"
-msgstr ""
+msgstr "¿Porqué usar y modificar etiquetas?"
 
 #: templates/tough/question_retag.html:96
 msgid "tag editors receive special awards from the community"
 msgstr ""
+"los editores de etiquetas reciben distinciones especiales de la comunidad"
 
 #: templates/tough/unanswered.html:95
 msgid "number of <strong>unanswered</strong> questions"
-msgstr ""
+msgstr "número de respuestas <strong>sin responder</strong>"
 
 #~ msgid "Community gives you awards for your questions, answers and votes."
 #~ msgstr ""
-- 
cgit v1.2.3-1-g7c22


From faf167aed99ac4e28927f729b7c7bc94a47ef139 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 26 Jul 2009 22:33:56 -0400
Subject: merged in latest Mikes changes

---
 locale/zh_CN/LC_MESSAGES/django.po | 629 +++++++++++++++++++++++++++++++++++++
 1 file changed, 629 insertions(+)
 create mode 100644 locale/zh_CN/LC_MESSAGES/django.po

(limited to 'locale')

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
new file mode 100644
index 00000000..176e41dc
--- /dev/null
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -0,0 +1,629 @@
+# Chinese translations for CNProg.com
+# Copyright (C) 2009
+# This file is distributed under the same license as the CNPROG package.
+# Mike Chen <chagel@gmail.com>, 2009.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-15 13:53+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: settings.py:12
+msgid "account/"
+msgstr ""
+
+#: settings.py:12 django_authopenid/urls.py:9 django_authopenid/urls.py:11
+msgid "signin/"
+msgstr ""
+
+#: django_authopenid/forms.py:67 django_authopenid/views.py:93
+msgid "i-names are not supported"
+msgstr "i-names不支持。"
+
+#: django_authopenid/forms.py:102 django_authopenid/forms.py:207
+msgid ""
+"Usernames can only contain                     letters, numbers and "
+"underscores"
+msgstr "用户名格式有误。只有字母，数字和下划线是允许的。"
+
+#: django_authopenid/forms.py:109
+msgid ""
+"This username does not exist                     in our database. Please "
+"choose another."
+msgstr "用户名不存在。请重新输入。"
+
+#: 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 "请输入用户名和密码。注意区分大小写。"
+
+#: django_authopenid/forms.py:130 django_authopenid/forms.py:235
+msgid "This account is inactive."
+msgstr "用户已冻结。"
+
+#: django_authopenid/forms.py:184
+msgid ""
+"This email is already                 registered in our database. Please "
+"choose another."
+msgstr "电子邮件已被注册。请使用一个新的邮件地址。"
+
+#: django_authopenid/forms.py:214
+msgid ""
+"This username don't exist.                         Please choose another."
+msgstr "用户名不存在"
+
+#: django_authopenid/forms.py:330
+msgid ""
+"Old password is incorrect.                     Please enter the correct "
+"password."
+msgstr "旧密码错误。"
+
+#: django_authopenid/forms.py:342
+msgid "new passwords do not match"
+msgstr "新密码不匹配"
+
+#: django_authopenid/forms.py:434
+msgid "Incorrect username."
+msgstr "用户名不正确"
+
+#: django_authopenid/urls.py:10
+msgid "signout/"
+msgstr ""
+
+#: django_authopenid/urls.py:11
+msgid "complete/"
+msgstr ""
+
+#: django_authopenid/urls.py:13
+msgid "register/"
+msgstr ""
+
+#: django_authopenid/urls.py:14
+msgid "signup/"
+msgstr ""
+
+#: django_authopenid/urls.py:16
+msgid "sendpw/"
+msgstr ""
+
+#: django_authopenid/urls.py:26
+msgid "delete/"
+msgstr ""
+
+#: django_authopenid/views.py:99
+#, python-format
+msgid "非法OpenID地址： %s"
+msgstr ""
+
+#: django_authopenid/views.py:366 templates/index.html:78
+msgid "Welcome"
+msgstr "欢迎"
+
+#: django_authopenid/views.py:456
+msgid "Password changed."
+msgstr "密码已更新。"
+
+#: django_authopenid/views.py:488
+msgid "Email changed."
+msgstr "邮件地址已更新。"
+
+#: django_authopenid/views.py:519 django_authopenid/views.py:671
+#, python-format
+msgid "No OpenID %s found associated in our database"
+msgstr "该OpenID %s 不在系统中。"
+
+#: 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 "OpenID %s 没有和当前登录用户绑定。"
+
+#: django_authopenid/views.py:531
+msgid "Email Changed."
+msgstr "邮件地址已更新。"
+
+#: django_authopenid/views.py:606
+msgid "This OpenID is already associated with another account."
+msgstr "这个OpenID已经绑定到另外一个帐号。"
+
+#: django_authopenid/views.py:611
+#, python-format
+msgid "OpenID %s is now associated with your account."
+msgstr "OpenID %s 已经绑定到您的帐号。"
+
+#: django_authopenid/views.py:681
+msgid "Account deleted."
+msgstr "帐号已删除。"
+
+#: django_authopenid/views.py:721
+msgid "Request for new password"
+msgstr "找回密码"
+
+#: django_authopenid/views.py:734
+msgid "A new password has been sent to your email address."
+msgstr "新的密码已经发送到您的邮件帐号。"
+
+#: django_authopenid/views.py:764
+#, python-format
+msgid ""
+"Could not change password. Confirmation key '%s'                is not "
+"registered."
+msgstr "不能修改密码。确认信息 '%s' 有误。"
+
+#: django_authopenid/views.py:773
+msgid ""
+"Can not change password. User don't exist anymore                 in our "
+"database."
+msgstr "不能修改密码。用户帐号不存在。"
+
+#: django_authopenid/views.py:782
+#, python-format
+msgid "Password changed for %s. You may now sign in."
+msgstr "帐号 %s 的密码已经修改。您现在可以用它来登录。"
+
+#: forum/user.py:17
+msgid "Overview"
+msgstr "概览"
+
+#: forum/user.py:18
+msgid "User overview"
+msgstr "用户概览"
+
+#: forum/user.py:19
+msgid "Overview - User Profile"
+msgstr "概览-用户资料"
+
+#: forum/user.py:25
+msgid "Recent"
+msgstr "最近活动"
+
+#: forum/user.py:26
+msgid "Recent activities"
+msgstr "用户最近活动情况"
+
+#: forum/user.py:27
+msgid "Recent - User Profile"
+msgstr "最近活动-用户资料"
+
+#: forum/user.py:34
+msgid "Response"
+msgstr "回应"
+
+#: forum/user.py:35
+msgid "Responses from others"
+msgstr "其他用户的回答和评论"
+
+#: forum/user.py:36
+msgid "Response - User Profile"
+msgstr "回应-用户资料"
+
+#: forum/user.py:43
+msgid "Reputation"
+msgstr "积分"
+
+#: forum/user.py:44
+msgid "Community reputation"
+msgstr "社区积分"
+
+#: forum/user.py:45
+msgid "Reputation - User Profile"
+msgstr "积分-用户资料"
+
+#: forum/user.py:51
+msgid "Favorites"
+msgstr "收藏"
+
+#: forum/user.py:52
+msgid "User's favorite questions"
+msgstr "用户收藏的问题"
+
+#: forum/user.py:53
+msgid "Favorites - User Profile"
+msgstr "收藏-用户资料"
+
+#: forum/user.py:60 templates/index.html:46 templates/questions.html:45
+msgid "Votes"
+msgstr "投票"
+
+#: forum/user.py:61
+msgid "Votes history"
+msgstr "用户投票历史"
+
+#: forum/user.py:62
+msgid "Votes - User Profile"
+msgstr "投票-用户资料"
+
+#: forum/user.py:69
+msgid "Preferences"
+msgstr "设置"
+
+#: forum/user.py:70
+msgid "User preferences"
+msgstr "用户参数设置"
+
+#: forum/user.py:71
+msgid "Preferences - User Profile"
+msgstr "设置-用户资料"
+
+#: templates/badges.html:5 templates/badges.html.py:16
+#: templates/header.html:31
+msgid "Badges"
+msgstr "奖牌榜"
+
+#: templates/base.html:53 templates/base_content.html:52
+msgid "Congratulations! You have new badges: "
+msgstr "恭喜您被授予奖牌："
+
+#: templates/base.html:54 templates/base_content.html:53
+msgid "go to see"
+msgstr "查看"
+
+#: templates/base.html:55 templates/base_content.html:54
+#: templates/header.html:35
+msgid "Profile"
+msgstr "我的资料"
+
+#: templates/footer.html:5 templates/header.html:10 templates/index.html:81
+msgid "About us"
+msgstr "关于我们"
+
+#: templates/footer.html:6 templates/header.html:11
+msgid "faq"
+msgstr "常见问题"
+
+#: templates/footer.html:8
+msgid "Contact"
+msgstr "联系我们"
+
+#: templates/footer.html:9
+msgid "Privacy"
+msgstr "隐私政策"
+
+#: templates/footer.html:10
+msgid "Feedback"
+msgstr "用户反馈"
+
+#: templates/header.html:6 templates/logout.html:5 templates/logout.html.py:16
+msgid "Logout"
+msgstr "退出登录"
+
+#: templates/header.html:8
+msgid "Login"
+msgstr "登录"
+
+#: templates/header.html:21
+msgid "link to homepage"
+msgstr "返回首页"
+
+#: templates/header.html:27 templates/header.html.py:56
+#: templates/index.html:21
+msgid "Questions"
+msgstr "问题"
+
+#: templates/header.html:28 templates/header.html.py:57
+msgid "Tags"
+msgstr "标签"
+
+#: templates/header.html:29 templates/header.html.py:58
+msgid "Users"
+msgstr "用户"
+
+#: templates/header.html:30
+msgid "Books"
+msgstr "读书"
+
+#: templates/header.html:32
+msgid "Unanswered"
+msgstr "没有回答的问题"
+
+#: templates/header.html:38
+msgid "Ask a question"
+msgstr "我要提问"
+
+#: templates/header.html:53
+msgid "Search"
+msgstr "搜索"
+
+#: templates/index.html:6
+msgid "Home"
+msgstr "首页"
+
+#: templates/index.html:23 templates/questions.html:25
+msgid "Newest updated questions"
+msgstr "最新更新的问题"
+
+#: templates/index.html:23 templates/questions.html:24
+msgid "Newest"
+msgstr "最新问题"
+
+#: templates/index.html:24 templates/questions.html:26
+msgid "Questions with most answers"
+msgstr "被回复最多的问题"
+
+#: templates/index.html:24 templates/questions.html:26
+msgid "Hottest"
+msgstr "最热问题"
+
+#: templates/index.html:25 templates/questions.html:27
+msgid "Questions with most votes"
+msgstr "被投票最多的问题"
+
+#: templates/index.html:25 templates/questions.html:27
+msgid "Best"
+msgstr "最有价值问题"
+
+#: templates/index.html:26 templates/index.html.py:118
+#: templates/questions.html:22
+msgid "All questions"
+msgstr "所有问题"
+
+#: templates/index.html:26
+msgid "All"
+msgstr "所有问题"
+
+#: templates/index.html:45 templates/questions.html:44
+msgid "Answers"
+msgstr "回答"
+
+#: templates/index.html:47 templates/questions.html:46
+msgid "Visits"
+msgstr "访问"
+
+#: templates/index.html:55 templates/questions.html:57
+#: templates/questions.html.py:69
+msgid "Community wiki"
+msgstr "社区wiki"
+
+#: templates/index.html:67 templates/index.html.py:91
+#: templates/questions.html:83
+msgid "Browse questions with tag of "
+msgstr "查看所有以下主题问题："
+
+#: templates/index.html:87
+msgid "Recent tags"
+msgstr "最新标签"
+
+#: templates/index.html:94 templates/index.html.py:118
+msgid "Popular tags"
+msgstr "受欢迎的标签"
+
+#: templates/index.html:98
+msgid "Recent badges"
+msgstr "最新奖牌"
+
+#: templates/index.html:109
+msgid "All badges"
+msgstr "所有奖牌"
+
+#: templates/index.html:113
+msgid "RSS feed of recent 30 questions"
+msgstr "RSS订阅最新30个问题"
+
+#: templates/index.html:113
+msgid "Subscribe"
+msgstr "订阅最新问题"
+
+#: templates/index.html:118
+msgid "Are you looking for more questions? Try to browse"
+msgstr "在寻找更多问题吗？请查阅"
+
+#: templates/index.html:118
+msgid " or "
+msgstr " 或者 "
+
+#: templates/index.html:118
+msgid ". Please help us answer "
+msgstr "。请帮助我们回答"
+
+#: templates/index.html:118
+msgid "Unanswered questions"
+msgstr "没有回答的问题"
+
+#: templates/pagesize.html:5
+msgid "Size per page:"
+msgstr "每页显示："
+
+#: templates/paginator.html:5
+msgid "Previous"
+msgstr "上一页"
+
+#: templates/questions.html:6
+msgid "Question list"
+msgstr "问题列表"
+
+#: templates/questions.html:22
+msgid "Tagged questions"
+msgstr "标签问题"
+
+#: templates/questions.html:22
+msgid "Query result"
+msgstr "查询结果"
+
+#: templates/questions.html:24
+msgid "New questions"
+msgstr "最新问题"
+
+#: templates/questions.html:25
+msgid "Active"
+msgstr "活跃问题"
+
+#: templates/questions.html:125
+msgid "Related tags"
+msgstr "相关标签"
+
+#: templates/authopenid/changeemail.html:10
+msgid "Account: change email"
+msgstr "修改电子邮件"
+
+#: templates/authopenid/changeemail.html:13
+msgid ""
+"This is where you can change the email address associated with your account. "
+"Please keep this email address up to date so we can send you a password-"
+"reset email if you request one."
+msgstr ""
+"您可以在这里修改您的电子邮件，请确保这个邮件地址有效-找回密码将发送新密码到您"
+"的邮件地址。"
+
+#: templates/authopenid/changeemail.html:15
+#: 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 "请改正以下错误："
+
+#: templates/authopenid/changeemail.html:32
+msgid "Email"
+msgstr "电子邮件"
+
+#: templates/authopenid/changeemail.html:33
+msgid "Password"
+msgstr "密码"
+
+#: templates/authopenid/changeemail.html:35
+msgid "Change email"
+msgstr "修改电子邮件"
+
+#: templates/authopenid/changeopenid.html:7
+msgid "Account: change OpenID URL"
+msgstr "修改OpenID地址"
+
+#: templates/authopenid/changeopenid.html:11
+msgid ""
+"This is where you can change your OpenID URL. Make sure you remember it!"
+msgstr "请修改您的OpenID地址，请不要忘记这个地址！"
+
+#: templates/authopenid/changeopenid.html:28
+msgid "OpenID URL:"
+msgstr "OpenID地址："
+
+#: templates/authopenid/changeopenid.html:29
+msgid "Change OpenID"
+msgstr "修改OpenID"
+
+#: templates/authopenid/changepw.html:13
+msgid "Account: change password"
+msgstr "修改密码"
+
+#: templates/authopenid/changepw.html:16
+msgid "This is where you can change your password. Make sure you remember it!"
+msgstr "请修改您的密码，切记不要忘记！"
+
+#: templates/authopenid/changepw.html:26
+msgid "Current password"
+msgstr "旧密码"
+
+#: templates/authopenid/changepw.html:27
+msgid "New password"
+msgstr "新密码"
+
+#: templates/authopenid/changepw.html:28
+msgid "New password again"
+msgstr "重复密码"
+
+#: templates/authopenid/changepw.html:29
+msgid "Change password"
+msgstr "修改密码"
+
+#: templates/authopenid/delete.html:8
+msgid "Account: delete account"
+msgstr "删除帐号"
+
+#: templates/authopenid/delete.html:12
+msgid ""
+"Note: After deleting your account, anyone will be able to register this "
+"username."
+msgstr "注意：删除您的帐号后，任何其他人可以再注册这个帐号。"
+
+#: templates/authopenid/delete.html:16
+msgid "Check confirm box, if you want delete your account."
+msgstr "如果确定删除，请选中多选框。"
+
+#: templates/authopenid/delete.html:19
+msgid "Password:"
+msgstr "密码："
+
+#: templates/authopenid/delete.html:31
+msgid "I am sure I want to delete my account."
+msgstr "我确认要删除这个帐号。"
+
+#: templates/authopenid/delete.html:32
+msgid "Password/OpenID URL"
+msgstr "密码/OpenID地址"
+
+#: templates/authopenid/delete.html:32
+msgid "(required for your security)"
+msgstr "（必需）"
+
+#: templates/authopenid/delete.html:34
+msgid "Delete account permanently"
+msgstr "永久删除帐号"
+
+#: templates/authopenid/settings.html:29
+msgid "Give your  account a new password."
+msgstr "修改密码"
+
+#: templates/authopenid/settings.html:31
+msgid "Add or update the email address associated with your account."
+msgstr "添加或者更新您的邮件地址。"
+
+#: templates/authopenid/settings.html:34
+msgid "Change openid associated to your account"
+msgstr "修改和你帐号绑定的OpenID地址"
+
+#: templates/authopenid/settings.html:38
+msgid "Erase your username and all your data from website"
+msgstr "删除您的帐号和所有内容"
+
+#, fuzzy
+#~ msgid "Badges "
+#~ msgstr "奖牌列表"
+
+#~ msgid ""
+#~ "This username is already                 taken. Please choose another."
+#~ msgstr "用户名已经被注册，请选用一个新的帐号。"
+
+#~ msgid "Your OpenID is verified! "
+#~ msgstr "您的OpenID帐号已经验证通过"
+
+#~ msgid "Associate your OpenID"
+#~ msgstr "绑定您的OpenID"
+
+#~ msgid ""
+#~ "\n"
+#~ "\t<p>If you're joining <strong>Sitename</strong>, associate your OpenID "
+#~ "with a new account. If you're already a member, associate with your "
+#~ "existing account.</p>\n"
+#~ "\t"
+#~ msgstr ""
+#~ "\n"
+#~ "\t<p>输入您的新帐号或者指定已经存在的帐号。</p>\n"
+#~ "\t"
+
+#~ msgid "A new account"
+#~ msgstr "新帐号"
+
+#~ msgid "An exisiting account"
+#~ msgstr "已经存在的帐号"
+
+#~ msgid "Account: Send a new password"
+#~ msgstr "发送一个新的密码"
+
+#~ msgid ""
+#~ "Lost your password ? Here you can ask to reset your password. Enter the "
+#~ "username you use  and you will get a confirmation email with your new "
+#~ "password. This new password will be activated only after you have clicked "
+#~ "on the link in the email."
+#~ msgstr ""
+#~ "丢失了您的密码？你可以在这里重设密码。输入用户名你会收到新的密码的邮件。密"
+#~ "码只有您在激活邮件中的链接才会被激活。"
+
+#~ msgid "Send new password"
+#~ msgstr "发送新密码"
-- 
cgit v1.2.3-1-g7c22


From 20a7ce5657bf3d8683bdb4f9b860dbad044fb2f3 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 4 Aug 2009 23:25:57 -0400
Subject: included changes by Adolfo and Chaitanya and found temporary fix for
 languages

---
 locale/es/LC_MESSAGES/django.po    |  1 -
 locale/zh_CN/LC_MESSAGES/django.po | 16 ----------------
 2 files changed, 17 deletions(-)

(limited to 'locale')

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index fe0aab7c..6801907c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 206f4b6f..a34a35f2 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -1103,10 +1103,6 @@ msgstr "标签问题"
 msgid "Active"
 msgstr "活跃问题"
 
-#: templates/questions.html:125
-msgid "Related tags"
-msgstr "相关标签"
-
 #: templates/authopenid/changeemail.html:10
 msgid "Account: change email"
 msgstr "修改电子邮件"
@@ -1449,11 +1445,6 @@ msgstr "有关Markdown详细说明"
 msgid "All questions"
 msgstr "所有问题"
 
-#: templates/questions.html:25
-#, fuzzy
-msgid "Active"
-msgstr "活跃问题"
-
 #: templates/questions.html:26
 #, fuzzy
 msgid "Questions with most answers"
@@ -1465,7 +1456,6 @@ msgstr ""
 
 # index.html
 #: templates/questions.html:57 templates/questions.html.py:69
-#, fuzzy
 msgid "Community wiki"
 msgstr "社区Wiki"
 
@@ -1739,11 +1729,6 @@ msgstr "这个问题被"
 msgid "this answer has been accepted to be correct"
 msgstr "有答案已被接受为正确答案"
 
-#: templates/authopenid/changeemail.html:6
-#, fuzzy
-msgid "Account: change email"
-msgstr "更换电子邮件"
-
 #: templates/authopenid/changeemail.html:9
 msgid ""
 "This is where you can change the email address associated with your account. "
@@ -1947,7 +1932,6 @@ msgid "Give your  account a new password."
 msgstr ""
 
 #: templates/authopenid/settings.html:30
-#, fuzzy
 msgid "Change email "
 msgstr "更换电子邮件"
 
-- 
cgit v1.2.3-1-g7c22


From 8ddd362a54981c4fa6434792723cdf04a77c6f32 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Tue, 4 Aug 2009 23:28:18 -0400
Subject: included changes by Adolfo and Chaitanya and found temporary fix for
 languages, switched files to Unix mode

---
 locale/en/LC_MESSAGES/django.mo    | Bin 0 -> 3214 bytes
 locale/es/LC_MESSAGES/django.mo    | Bin 0 -> 44804 bytes
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 0 -> 36796 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 locale/en/LC_MESSAGES/django.mo
 create mode 100644 locale/es/LC_MESSAGES/django.mo
 create mode 100644 locale/zh_CN/LC_MESSAGES/django.mo

(limited to 'locale')

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..a4dd5554
Binary files /dev/null and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..7e934ecf
Binary files /dev/null and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..cfcea03d
Binary files /dev/null and b/locale/zh_CN/LC_MESSAGES/django.mo differ
-- 
cgit v1.2.3-1-g7c22


From ef8f66ba6c7a22c277c6315df8040365b5684e6c Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 5 Aug 2009 22:50:08 -0400
Subject: added anonymous posting, per-question subscription and fixes by
 Pothers and some more, see development.log

---
 locale/en/LC_MESSAGES/django.mo    |  Bin 3214 -> 0 bytes
 locale/en/LC_MESSAGES/django.po    | 1775 +++++++++++++++++++-----------------
 locale/es/LC_MESSAGES/django.mo    |  Bin 44804 -> 0 bytes
 locale/es/LC_MESSAGES/django.po    | 1329 ++++++++++++++++-----------
 locale/zh_CN/LC_MESSAGES/django.mo |  Bin 36796 -> 0 bytes
 locale/zh_CN/LC_MESSAGES/django.po |   33 +-
 6 files changed, 1746 insertions(+), 1391 deletions(-)
 delete mode 100644 locale/en/LC_MESSAGES/django.mo
 delete mode 100644 locale/es/LC_MESSAGES/django.mo
 delete mode 100644 locale/zh_CN/LC_MESSAGES/django.mo

(limited to 'locale')

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
deleted file mode 100644
index a4dd5554..00000000
Binary files a/locale/en/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index c4c1e674..cc42454c 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-06-22 20:40-0400\n"
+"POT-Creation-Date: 2009-08-05 22:26-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,19 +16,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:32
+#: settings.py:12
 msgid "account/"
 msgstr ""
 
-#: settings.py:32 django_authopenid/urls.py:9 django_authopenid/urls.py:11
+#: 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
 msgid "signin/"
 msgstr ""
 
-#: django_authopenid/forms.py:67 django_authopenid/views.py:93
+#: django_authopenid/forms.py:67 django_authopenid/views.py:102
 msgid "i-names are not supported"
 msgstr ""
 
-#: django_authopenid/forms.py:102 django_authopenid/forms.py:207
+#: django_authopenid/forms.py:102
 msgid ""
 "Usernames can only contain                     letters, numbers and "
 "underscores"
@@ -40,19 +42,19 @@ msgid ""
 "choose another."
 msgstr ""
 
-#: django_authopenid/forms.py:126 django_authopenid/forms.py:231
+#: django_authopenid/forms.py:126 django_authopenid/forms.py:233
 msgid ""
 "Please enter a valid                     username and password. Note that "
 "both fields are                     case-sensitive."
 msgstr ""
 
-#: django_authopenid/forms.py:130 django_authopenid/forms.py:235
+#: django_authopenid/forms.py:130 django_authopenid/forms.py:237
 msgid "This account is inactive."
 msgstr ""
 
-#: django_authopenid/forms.py:158
+#: django_authopenid/forms.py:158 django_authopenid/forms.py:210
 msgid "invalid user name"
-msgstr ""
+msgstr "User names can contain letters, underscore and empty space."
 
 #: django_authopenid/forms.py:160
 msgid "sorry, this name can not be used, please try another"
@@ -66,137 +68,147 @@ msgstr ""
 msgid "this name is already in use - please try anoter"
 msgstr ""
 
-#: django_authopenid/forms.py:184
+#: django_authopenid/forms.py:185
 msgid ""
-"This email is already                 registered in our database. Please "
-"choose another."
+"This email is already                         registered in our database. "
+"Please choose another."
 msgstr ""
 
-#: django_authopenid/forms.py:214
+#: django_authopenid/forms.py:216
 msgid ""
 "This username don't exist.                         Please choose another."
 msgstr ""
 
-#: django_authopenid/forms.py:253
+#: django_authopenid/forms.py:255
 msgid "choose a username"
 msgstr ""
 
-#: django_authopenid/forms.py:255 templates/authopenid/signup.html:36
+#: django_authopenid/forms.py:257 templates/authopenid/signup.html:38
 msgid "your email address"
 msgstr ""
 
-#: django_authopenid/forms.py:257 templates/authopenid/signup.html:37
+#: django_authopenid/forms.py:259 templates/authopenid/signup.html:39
 msgid "choose password"
 msgstr ""
 
-#: django_authopenid/forms.py:259 templates/authopenid/signup.html:38
+#: django_authopenid/forms.py:261 templates/authopenid/signup.html:40
 msgid "retype password"
 msgstr ""
 
-#: django_authopenid/forms.py:330
+#: django_authopenid/forms.py:335
 msgid ""
 "Old password is incorrect.                     Please enter the correct "
 "password."
 msgstr ""
 
-#: django_authopenid/forms.py:342
+#: django_authopenid/forms.py:347
 msgid "new passwords do not match"
 msgstr ""
 
-#: django_authopenid/forms.py:434
+#: django_authopenid/forms.py:442
 msgid "Incorrect username."
 msgstr ""
 
 #: django_authopenid/urls.py:10
-msgid "signout/"
+msgid "newquestion/"
 msgstr ""
 
 #: django_authopenid/urls.py:11
-msgid "complete/"
+msgid "newanswer/"
+msgstr ""
+
+#: django_authopenid/urls.py:12
+msgid "signout/"
 msgstr ""
 
 #: django_authopenid/urls.py:13
+msgid "complete/"
+msgstr ""
+
+#: django_authopenid/urls.py:15
 msgid "register/"
 msgstr ""
 
-#: django_authopenid/urls.py:14
+#: django_authopenid/urls.py:16
 msgid "signup/"
 msgstr ""
 
-#: django_authopenid/urls.py:16
+#: django_authopenid/urls.py:18
 msgid "sendpw/"
 msgstr ""
 
-#: django_authopenid/urls.py:26
+#: django_authopenid/urls.py:29
 msgid "delete/"
 msgstr ""
 
-#: django_authopenid/views.py:99
+#: django_authopenid/views.py:108
 #, python-format
-msgid "非法OpenID地址： %s"
+msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:366
+#: django_authopenid/views.py:417 django_authopenid/views.py:544
 msgid "Welcome"
-msgstr ""
+msgstr "Verification Email from NMR Wiki Q&A"
 
-#: django_authopenid/views.py:456
+#: django_authopenid/views.py:507
 msgid "Password changed."
 msgstr ""
 
-#: django_authopenid/views.py:488
-msgid "Email changed."
+#: django_authopenid/views.py:519 django_authopenid/views.py:524
+msgid "your email needs to be validated"
 msgstr ""
+"Your email needs to be validated. Please see details <a "
+"id='validate_email_alert' href=\"/faq#validate\">here</a>."
 
-#: django_authopenid/views.py:519 django_authopenid/views.py:671
+#: django_authopenid/views.py:681 django_authopenid/views.py:833
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr ""
 
-#: django_authopenid/views.py:523 django_authopenid/views.py:678
+#: django_authopenid/views.py:685 django_authopenid/views.py:840
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr ""
 
-#: django_authopenid/views.py:531
+#: django_authopenid/views.py:693
 msgid "Email Changed."
 msgstr ""
 
-#: django_authopenid/views.py:606
+#: django_authopenid/views.py:768
 msgid "This OpenID is already associated with another account."
 msgstr ""
 
-#: django_authopenid/views.py:611
+#: django_authopenid/views.py:773
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr ""
 
-#: django_authopenid/views.py:681
+#: django_authopenid/views.py:843
 msgid "Account deleted."
 msgstr ""
 
-#: django_authopenid/views.py:721
+#: django_authopenid/views.py:883
 msgid "Request for new password"
 msgstr ""
 
-#: django_authopenid/views.py:734
+#: django_authopenid/views.py:896
 msgid "A new password has been sent to your email address."
 msgstr ""
 
-#: django_authopenid/views.py:764
+#: django_authopenid/views.py:926
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
 "registered."
 msgstr ""
 
-#: django_authopenid/views.py:773
+#: django_authopenid/views.py:935
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
 msgstr ""
 
-#: django_authopenid/views.py:782
+#: django_authopenid/views.py:944
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr ""
@@ -237,7 +249,7 @@ msgstr ""
 msgid "question"
 msgstr ""
 
-#: forum/const.py:57 templates/book.html:110 templates/backup/book.html:110
+#: forum/const.py:57 templates/book.html:110
 msgid "answer"
 msgstr ""
 
@@ -259,7 +271,7 @@ msgstr ""
 
 #: forum/const.py:62
 msgid "received award"
-msgstr ""
+msgstr "received badge"
 
 #: forum/const.py:63
 msgid "marked best answer"
@@ -317,43 +329,21 @@ msgstr ""
 msgid "retagged"
 msgstr ""
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-#: templates/faq.html:25 templates/faq.html.py:108
-#: templates/backup/base.html:7 templates/backup/base_content.html:6
-#: templates/backup/faq.html:25 templates/backup/faq.html.py:108
-#: templates/tough/faq.html:23 templates/tough/faq.html.py:106
-#: templates/tough/question_retag.html:89
-msgid "site title"
-msgstr ""
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid " - "
 msgstr ""
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-#: templates/backup/base.html:7 templates/backup/base_content.html:6
-msgid "site slogan"
-msgstr ""
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid "latest questions"
 msgstr ""
 
-#: forum/feed.py:19 templates/index.html:8 templates/backup/index.html:8
-msgid "meta site content"
-msgstr ""
-
-#: forum/feed.py:21
-msgid "copyright message"
+#: forum/feed.py:19
+msgid "questions/"
 msgstr ""
 
 #: forum/forms.py:14 templates/answer_edit_tips.html:34
-#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31
 #: templates/question_edit_tips.html:36
-#: templates/backup/answer_edit_tips.html:33
-#: templates/backup/answer_edit_tips.html:38
-#: templates/backup/question_edit_tips.html:29
-#: templates/backup/question_edit_tips.html:34
 msgid "title"
 msgstr ""
 
@@ -374,108 +364,125 @@ msgid "question content must be > 10 characters"
 msgstr ""
 
 #: forum/forms.py:45 templates/header.html:30 templates/header.html.py:61
-#: templates/backup/header.html:30 templates/backup/header.html.py:59
 msgid "tags"
 msgstr ""
 
-#: forum/forms.py:46
-msgid "please use space to separate tags (this enables autocomplete feature)"
+#: forum/forms.py:47
+msgid ""
+"Tags are short keywords, with no spaces within. Up to five tags can be used."
 msgstr ""
 
-#: forum/forms.py:53
+#: forum/forms.py:54 templates/question_retag.html:38
 msgid "tags are required"
 msgstr ""
 
-#: forum/forms.py:57
+#: forum/forms.py:58
 msgid "please use 5 tags or less"
 msgstr ""
 
-#: forum/forms.py:60
+#: forum/forms.py:61
 msgid "tags must be shorter than 20 characters"
 msgstr ""
 
-#: forum/forms.py:64
+#: forum/forms.py:65
 msgid ""
 "please use following characters in tags: letters 'a-z', numbers, and "
 "characters '.-_#'"
 msgstr ""
 
-#: forum/forms.py:74 templates/index.html:56 templates/question.html:196
-#: templates/question.html.py:377 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:199
+#: templates/question.html.py:380 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
-#: templates/unanswered.html.py:60 templates/backup/index.html:56
-#: templates/backup/question.html:195 templates/backup/question.html.py:367
-#: templates/backup/questions.html:57 templates/backup/questions.html.py:69
-#: templates/backup/unanswered.html:47 templates/backup/unanswered.html:59
-#: templates/tough/unanswered.html:46 templates/tough/unanswered.html.py:58
+#: templates/unanswered.html.py:60
 msgid "community wiki"
 msgstr ""
 
-#: forum/forms.py:75
+#: forum/forms.py:76
 msgid ""
 "if you choose community wiki option, the question and answer do not generate "
 "points and name of author will not be shown"
 msgstr ""
 
-#: forum/forms.py:84
+#: forum/forms.py:89
 msgid "update summary:"
 msgstr ""
 
-#: forum/forms.py:85
+#: forum/forms.py:90
 msgid ""
 "enter a brief summary of your revision (e.g. fixed spelling, grammar, "
 "improved style, this field is optional)"
 msgstr ""
 
-#: forum/forms.py:160
+#: forum/forms.py:175
 msgid "this email does not have to be linked to gravatar"
 msgstr ""
 
-#: forum/forms.py:161
+#: forum/forms.py:176
 msgid "Real name"
 msgstr ""
 
-#: forum/forms.py:162
+#: forum/forms.py:177
 msgid "Website"
 msgstr ""
 
-#: forum/forms.py:163
+#: forum/forms.py:178
 msgid "Location"
 msgstr ""
 
-#: forum/forms.py:164
+#: forum/forms.py:179
 msgid "Date of birth"
 msgstr ""
 
-#: forum/forms.py:164
+#: forum/forms.py:179
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr ""
 
-#: forum/forms.py:165 templates/authopenid/settings.html:20
+#: forum/forms.py:180 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr ""
 
-#: forum/forms.py:190 forum/forms.py:191
+#: forum/forms.py:207 forum/forms.py:208
 msgid "this email has already been registered, please use another one"
 msgstr ""
 
-#: forum/models.py:316 templates/badges.html:52
-#: templates/backup/badges.html:52
+#: forum/models.py:238
+#, python-format
+msgid "%(author)s modified the question"
+msgstr ""
+
+#: forum/models.py:242
+#, python-format
+msgid "%(people)s posted %(new_answer_count)s new answers"
+msgstr ""
+
+#: forum/models.py:247
+#, python-format
+msgid "%(people)s commented the question"
+msgstr ""
+
+#: forum/models.py:252
+#, python-format
+msgid "%(people)s commented answers"
+msgstr ""
+
+#: forum/models.py:254
+#, python-format
+msgid "%(people)s commented the answer"
+msgstr ""
+
+#: forum/models.py:433 templates/badges.html:52
 msgid "gold"
 msgstr ""
 
-#: forum/models.py:317 templates/badges.html:62
-#: templates/backup/badges.html:62
+#: forum/models.py:434 templates/badges.html:60
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:318 templates/badges.html:70
-#: templates/backup/badges.html:70
+#: forum/models.py:435 templates/badges.html:67
 msgid "bronze"
 msgstr ""
 
 #: forum/user.py:16 templates/user_tabs.html:7
-#: templates/backup/user_tabs.html:6
 msgid "overview"
 msgstr ""
 
@@ -488,7 +495,6 @@ msgid "user profile overview"
 msgstr ""
 
 #: forum/user.py:24 templates/user_tabs.html:9
-#: templates/backup/user_tabs.html:8
 msgid "recent activity"
 msgstr ""
 
@@ -501,12 +507,10 @@ msgid "profile - recent activity"
 msgstr ""
 
 #: forum/user.py:33 templates/user_tabs.html:13
-#: templates/backup/user_tabs.html:12
 msgid "responses"
 msgstr ""
 
 #: forum/user.py:34 templates/user_tabs.html:12
-#: templates/backup/user_tabs.html:11
 msgid "comments and answers to others questions"
 msgstr ""
 
@@ -515,7 +519,6 @@ msgid "profile - responses"
 msgstr ""
 
 #: forum/user.py:42 templates/user_info.html:23 templates/users.html:26
-#: templates/backup/user_info.html:22 templates/backup/users.html:25
 msgid "reputation"
 msgstr ""
 
@@ -540,12 +543,10 @@ msgid "profile - favorite questions"
 msgstr ""
 
 #: forum/user.py:59 templates/user_tabs.html:20
-#: templates/backup/user_tabs.html:19
 msgid "casted votes"
 msgstr "votes"
 
 #: forum/user.py:60 templates/user_tabs.html:20
-#: templates/backup/user_tabs.html:19
 msgid "user vote record"
 msgstr ""
 
@@ -557,8 +558,7 @@ msgstr ""
 msgid "preferences"
 msgstr ""
 
-#: forum/user.py:69 templates/user_tabs.html:28
-#: templates/backup/user_tabs.html:27
+#: forum/user.py:69 templates/user_tabs.html:27
 msgid "user preference settings"
 msgstr ""
 
@@ -566,27 +566,42 @@ msgstr ""
 msgid "profile - user preferences"
 msgstr ""
 
-#: forum/views.py:1730
+#: forum/views.py:304
+msgid "/account/"
+msgstr ""
+
+#: forum/views.py:943
+#, 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 <a href='/faq#validate'>more details here</a>"
+
+#: forum/views.py:1853
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr ""
 
-#: forum/views.py:1732
+#: forum/views.py:1855
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1734
+#: forum/views.py:1857
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1736
+#: forum/views.py:1859
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
 msgstr ""
 
+#: forum/management/commands/send_email_alerts.py:35
+msgid "updates from website"
+msgstr ""
+
 #: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168
-#: templates/header.html:33 templates/backup/header.html:33
+#: templates/header.html:33
 msgid "badges"
 msgstr ""
 
@@ -598,140 +613,121 @@ msgstr ""
 msgid " ago"
 msgstr ""
 
-#: templates/404.html:24 templates/backup/404.html:24
+#: templates/404.html:24
 msgid "Sorry, could not find the page you requested."
 msgstr ""
 
-#: templates/404.html:26 templates/backup/404.html:26
+#: templates/404.html:26
 msgid "This might have happened for the following reasons:"
 msgstr ""
 
-#: templates/404.html:28 templates/backup/404.html:28
+#: templates/404.html:28
 msgid "this question or answer has been deleted;"
 msgstr ""
 
-#: templates/404.html:29 templates/backup/404.html:29
+#: templates/404.html:29
 msgid "url has error - please check it;"
 msgstr ""
 
-#: templates/404.html:30 templates/backup/404.html:30
+#: templates/404.html:30
 msgid ""
 "the page you tried to visit is protected or you don't have sufficient "
 "points, see"
 msgstr ""
 
-#: templates/404.html:31 templates/backup/404.html:31
+#: templates/404.html:31
 msgid "if you believe this error 404 should not have occured, please"
 msgstr ""
 
-#: templates/404.html:32 templates/backup/404.html:32
+#: templates/404.html:32
 msgid "report this problem"
 msgstr ""
 
-#: templates/404.html:41 templates/500.html:27 templates/backup/404.html:41
-#: templates/backup/500.html:27
+#: templates/404.html:41 templates/500.html:27
 msgid "back to previous page"
 msgstr ""
 
-#: templates/404.html:42 templates/backup/404.html:42
+#: templates/404.html:42
 msgid "see all questions"
 msgstr ""
 
-#: templates/404.html:43 templates/backup/404.html:43
+#: templates/404.html:43
 msgid "see all tags"
 msgstr ""
 
-#: templates/500.html:24 templates/backup/500.html:24
+#: templates/500.html:22
+msgid "sorry, system error"
+msgstr ""
+
+#: templates/500.html:24
 msgid "system error log is recorded, error will be fixed as soon as possible"
 msgstr ""
 
-#: templates/500.html:25 templates/backup/500.html:25
+#: templates/500.html:25
 msgid "please report the error to the site administrators if you wish"
 msgstr ""
 
-#: templates/500.html:28 templates/backup/500.html:28
+#: templates/500.html:28
 msgid "see latest questions"
 msgstr ""
 
-#: templates/500.html:29 templates/backup/500.html:29
+#: templates/500.html:29
 msgid "see tags"
 msgstr ""
 
 #: templates/about.html:6 templates/about.html.py:11
-#: templates/backup/about.html:6 templates/backup/about.html.py:11
 msgid "About"
 msgstr ""
 
 #: templates/answer_edit.html:4 templates/answer_edit.html.py:47
-#: templates/backup/answer_edit.html:3 templates/backup/answer_edit.html:46
 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:37
-#: templates/question.html.py:40 templates/question_edit.html:27
-#: templates/backup/answer_edit.html:23 templates/backup/answer_edit.html:26
-#: templates/backup/ask.html:24 templates/backup/ask.html.py:27
-#: templates/backup/question.html:36 templates/backup/question.html.py:39
-#: templates/backup/question_edit.html:25
+#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40
+#: templates/question.html.py:43 templates/question_edit.html:27
 msgid "hide preview"
 msgstr ""
 
 #: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:40 templates/question_edit.html:27
-#: templates/backup/answer_edit.html:26 templates/backup/ask.html:27
-#: templates/backup/question.html:39 templates/backup/question_edit.html:25
+#: templates/question.html:43 templates/question_edit.html:27
 msgid "show preview"
 msgstr ""
 
 #: templates/answer_edit.html:47 templates/question_edit.html:65
-#: templates/revisions_answer.html:36 templates/revisions_question.html:36
-#: templates/backup/answer_edit.html:46 templates/backup/question_edit.html:63
-#: templates/backup/revisions_answer.html:35
-#: templates/backup/revisions_question.html:34
-#: templates/tough/question_retag.html:51
+#: templates/question_retag.html:52 templates/revisions_answer.html:36
+#: templates/revisions_question.html:36
 msgid "back"
 msgstr ""
 
 #: templates/answer_edit.html:52 templates/question_edit.html:70
 #: templates/revisions_answer.html:47 templates/revisions_question.html:47
-#: templates/backup/answer_edit.html:51 templates/backup/question_edit.html:68
-#: templates/backup/revisions_answer.html:46
-#: templates/backup/revisions_question.html:45
 msgid "revision"
 msgstr ""
 
 #: templates/answer_edit.html:55 templates/question_edit.html:74
-#: templates/backup/answer_edit.html:54 templates/backup/question_edit.html:72
 msgid "select revision"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:81
-#: templates/question.html:447 templates/question_edit.html:91
-#: templates/backup/answer_edit.html:61 templates/backup/ask.html:80
-#: templates/backup/question.html:437 templates/backup/question_edit.html:89
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 templates/question_edit.html:91
 msgid "Toggle the real time Markdown editor preview"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:81
-#: templates/question.html:447 templates/question_edit.html:91
-#: templates/backup/answer_edit.html:61 templates/backup/ask.html:80
-#: templates/backup/question.html:437 templates/backup/question_edit.html:89
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr ""
 
 #: templates/answer_edit.html:73 templates/question_edit.html:119
-#: templates/backup/answer_edit.html:72
-#: templates/backup/question_edit.html:117
+#: templates/question_retag.html:75
 msgid "Save edit"
 msgstr ""
 
 #: templates/answer_edit.html:74 templates/close.html:29
-#: templates/question_edit.html:120 templates/reopen.html:30
-#: templates/user_edit.html:83 templates/backup/answer_edit.html:73
-#: templates/backup/close.html:29 templates/backup/question_edit.html:118
-#: templates/backup/reopen.html:28 templates/backup/user_edit.html:81
-#: templates/tough/question_retag.html:75
+#: templates/question_edit.html:120 templates/question_retag.html:76
+#: templates/reopen.html:30 templates/user_edit.html:83
+#: templates/authopenid/changeemail.html:34
 msgid "Cancel"
 msgstr ""
 
@@ -739,726 +735,613 @@ msgstr ""
 msgid "answer tips"
 msgstr "Tips"
 
-#: templates/answer_edit_tips.html:7 templates/backup/answer_edit_tips.html:6
+#: templates/answer_edit_tips.html:7
 msgid "please make your answer relevant to this community"
 msgstr ""
 
-#: templates/answer_edit_tips.html:10 templates/backup/answer_edit_tips.html:9
+#: templates/answer_edit_tips.html:10
 msgid "try to give an answer, rather than engage into a discussion"
 msgstr ""
 
 #: templates/answer_edit_tips.html:13
-#: templates/backup/answer_edit_tips.html:12
 msgid "please try to provide details"
 msgstr ""
 
 #: templates/answer_edit_tips.html:16 templates/question_edit_tips.html:13
-#: templates/backup/answer_edit_tips.html:15
-#: templates/backup/question_edit_tips.html:11
 msgid "be clear and concise"
 msgstr ""
 
 #: templates/answer_edit_tips.html:19 templates/question_edit_tips.html:16
-#: templates/backup/answer_edit_tips.html:18
-#: templates/backup/question_edit_tips.html:14
 msgid "see frequently asked questions"
 msgstr ""
 
 #: templates/answer_edit_tips.html:25 templates/question_edit_tips.html:22
-#: templates/backup/answer_edit_tips.html:24
-#: templates/backup/question_edit_tips.html:20
 msgid "Markdown tips"
 msgstr "Markdown basics"
 
 #: templates/answer_edit_tips.html:28 templates/question_edit_tips.html:25
-#: templates/backup/answer_edit_tips.html:27
-#: templates/backup/question_edit_tips.html:23
 msgid "*italic* or __italic__"
 msgstr ""
 
 #: templates/answer_edit_tips.html:31 templates/question_edit_tips.html:28
-#: templates/backup/answer_edit_tips.html:30
-#: templates/backup/question_edit_tips.html:26
 msgid "**bold** or __bold__"
 msgstr ""
 
 #: templates/answer_edit_tips.html:34 templates/question_edit_tips.html:31
-#: templates/backup/answer_edit_tips.html:33
-#: templates/backup/question_edit_tips.html:29
 msgid "link"
 msgstr ""
 
-#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:39
+#: 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
-#: templates/backup/answer_edit_tips.html:33
-#: templates/backup/answer_edit_tips.html:38
-#: templates/backup/question_edit_tips.html:29
-#: templates/backup/question_edit_tips.html:34
 msgid "text"
 msgstr ""
 
-#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:36
-#: templates/backup/answer_edit_tips.html:38
-#: templates/backup/question_edit_tips.html:34
+#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36
 msgid "image"
 msgstr ""
 
-#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:40
-#: templates/backup/answer_edit_tips.html:42
-#: templates/backup/question_edit_tips.html:38
+#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40
 msgid "numbered list:"
 msgstr ""
 
-#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:45
-#: templates/backup/answer_edit_tips.html:47
-#: templates/backup/question_edit_tips.html:43
+#: templates/answer_edit_tips.html:47 templates/question_edit_tips.html:45
 msgid "basic HTML tags are also supported"
 msgstr ""
 
-#: templates/answer_edit_tips.html:51 templates/question_edit_tips.html:48
-#: templates/backup/answer_edit_tips.html:50
-#: templates/backup/question_edit_tips.html:46
+#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48
 msgid "learn more about Markdown"
 msgstr ""
 
-#: templates/ask.html:4 templates/ask.html.py:60 templates/backup/ask.html:3
-#: templates/backup/ask.html.py:59
+#: templates/ask.html:4 templates/ask.html.py:60
 msgid "Ask a question"
 msgstr ""
 
-#: templates/ask.html:106 templates/backup/ask.html:105
-msgid "Use"
-msgstr ""
-
-#: templates/ask.html:106 templates/backup/ask.html:105
-msgid "learn more about OpenID"
+#: templates/ask.html:67
+msgid "login to post question info"
 msgstr ""
+"<span class=\"strong big\">You are welcome to start submitting your question "
+"anonymously</span>  - you are currently not logged in. When you post your "
+"question, you will be redirected to the login/signup page. Your question "
+"will be saved meanwhile  and will be posted when you log in. Login/signup "
+"process is very simple. Login takes about 30 seconds, initial signup takes a "
+"minute or less."
 
-#: templates/ask.html:106 templates/authopenid/signin.html:34
-#: templates/authopenid/signin.html:60 templates/backup/ask.html:105
-msgid "Login"
-msgstr ""
-
-#: templates/ask.html:109 templates/backup/ask.html:108
-msgid "Get your own "
+#: templates/ask.html:73
+#, python-format
+msgid "must have valid %(email)s to post"
 msgstr ""
+"<span class='strong big'>Looks like your email address, %(email)s has not "
+"yet been validated.</span> To post messages you must verify your email, "
+"please see <a href='/faq#validate'>more details here</a>.<br>You can submit "
+"your question now and validate email after that. Your question will saved as "
+"pending meanwhile. "
 
-#: templates/ask.html:117 templates/authopenid/sendpw.html:27
-#: templates/backup/ask.html:116
-msgid "User name"
+#: templates/ask.html:108
+msgid "(required)"
 msgstr ""
 
-#: templates/ask.html:120 templates/backup/ask.html:119
-msgid "Email: (won't be shown to anyone)"
-msgstr ""
+#: templates/ask.html:115
+msgid "Login/signup to post your question"
+msgstr "Login/Signup to Post"
 
-#: templates/ask.html:127 templates/backup/ask.html:126
+#: templates/ask.html:117
 msgid "Ask your question"
-msgstr ""
+msgstr "Ask Your Question"
 
 #: templates/badge.html:6 templates/badge.html.py:17
-#: templates/backup/badge.html:5 templates/backup/badge.html.py:16
 msgid "Badge"
 msgstr ""
 
-#: templates/badge.html:26 templates/backup/badge.html:25
+#: templates/badge.html:26
 msgid "The users have been awarded with badges:"
 msgstr ""
 
-#: templates/badges.html:6 templates/backup/badges.html:6
+#: templates/badges.html:6
 msgid "Badges summary"
 msgstr ""
 
 #: templates/badges.html:17 templates/user_stats.html:113
-#: templates/backup/badges.html:17 templates/backup/user_stats.html:112
 msgid "Badges"
 msgstr ""
 
-#: templates/badges.html:21 templates/backup/badges.html:21
+#: templates/badges.html:21
 msgid "Community gives you awards for your questions, answers and votes."
 msgstr ""
+"If your questions and answers are highly voted, your contribution to this "
+"Q&amp;A community will be recognized with the variety of badges."
 
-#: templates/badges.html:22 templates/backup/badges.html:22
+#: templates/badges.html:22
 msgid ""
 "Below is the list of available badges and number of times each type of badge "
 "has been awarded."
 msgstr ""
+"Currently badges differ only by their level: <strong>gold</strong>, "
+"<strong>silver</strong> and <strong>bronze</strong> (their meanings are "
+"described on the right). In the future there will be many types of badges at "
+"each level. <strong>Please give us your <a href=\"/faq#feedback\">feedback</"
+"a></strong> - 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/backup/badges.html:49
+#: templates/badges.html:49
 msgid "Community badges"
-msgstr ""
+msgstr "Badge levels"
 
-#: templates/badges.html:55 templates/backup/badges.html:55
-msgid "Gold badge is very rare."
+#: templates/badges.html:55
+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:56 templates/backup/badges.html:56
-msgid ""
-"To obtain it you have to show profound knowledge and ability in addition to "
-"actively participating in the community."
+#: templates/badges.html:63
+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:57 templates/backup/badges.html:57
-msgid "Gold badge is the highest award in this community."
-msgstr ""
-
-#: templates/badges.html:65 templates/backup/badges.html:65
-msgid "Obtaining silver badge requires significant patience."
-msgstr ""
-
-#: templates/badges.html:66 templates/backup/badges.html:66
-msgid "If you got one, you've very significantly contributed to this community"
-msgstr ""
-
-#: templates/badges.html:69 templates/backup/badges.html:69
+#: templates/badges.html:66
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: templates/badges.html:73 templates/backup/badges.html:73
-msgid ""
-"If you are active in this community, you will will get this medal - still it "
-"is a special honor."
+#: templates/badges.html:70
+msgid "bronze badge description"
 msgstr ""
+"If you are an active participant in this community, you will be recognized "
+"with this badge."
 
-#: templates/base.html:59 templates/base_content.html:60
-#: templates/backup/base.html:59 templates/backup/base_content.html:57
-msgid "congratulations, community gave you a badge"
-msgstr ""
-
-#: templates/base.html:61 templates/base_content.html:62
-#: templates/backup/base.html:61 templates/backup/base_content.html:59
-msgid "profile"
-msgstr ""
-
-#: templates/base_content.html:61 templates/backup/base_content.html:58
-msgid "see"
-msgstr ""
-
-#: templates/book.html:7 templates/backup/book.html:7
+#: templates/book.html:7
 msgid "reading channel"
 msgstr ""
 
-#: templates/book.html:26 templates/backup/book.html:26
+#: templates/book.html:26
 msgid "[author]"
 msgstr ""
 
-#: templates/book.html:30 templates/backup/book.html:30
+#: templates/book.html:30
 msgid "[publisher]"
 msgstr ""
 
-#: templates/book.html:34 templates/backup/book.html:34
+#: templates/book.html:34
 msgid "[publication date]"
 msgstr ""
 
-#: templates/book.html:38 templates/backup/book.html:38
+#: templates/book.html:38
 msgid "[price]"
 msgstr ""
 
-#: templates/book.html:39 templates/backup/book.html:39
+#: templates/book.html:39
 msgid "currency unit"
 msgstr ""
 
-#: templates/book.html:42 templates/backup/book.html:42
+#: templates/book.html:42
 msgid "[pages]"
 msgstr ""
 
-#: templates/book.html:43 templates/backup/book.html:43
+#: templates/book.html:43
 msgid "pages abbreviation"
 msgstr ""
 
-#: templates/book.html:46 templates/backup/book.html:46
+#: templates/book.html:46
 msgid "[tags]"
 msgstr ""
 
-#: templates/book.html:56 templates/backup/book.html:56
+#: templates/book.html:56
 msgid "author blog"
 msgstr ""
 
-#: templates/book.html:62 templates/backup/book.html:62
+#: templates/book.html:62
 msgid "book directory"
 msgstr ""
 
-#: templates/book.html:66 templates/backup/book.html:66
+#: templates/book.html:66
 msgid "buy online"
 msgstr ""
 
-#: templates/book.html:79 templates/backup/book.html:79
+#: templates/book.html:79
 msgid "reader questions"
 msgstr ""
 
-#: templates/book.html:82 templates/backup/book.html:82
+#: templates/book.html:82
 msgid "ask the author"
 msgstr ""
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:17 templates/backup/book.html:88
-#: templates/backup/book.html.py:93 templates/backup/users_questions.html:16
+#: templates/users_questions.html:17
 msgid "this question was selected as favorite"
 msgstr ""
 
 #: templates/book.html:88 templates/book.html.py:93
 #: templates/users_questions.html:11 templates/users_questions.html.py:17
-#: templates/backup/book.html:88 templates/backup/book.html.py:93
-#: templates/backup/users_questions.html:10
-#: templates/backup/users_questions.html:16
 msgid "number of times"
 msgstr ""
 
-#: templates/book.html:105 templates/index.html:47 templates/questions.html:46
+#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
 #: templates/unanswered.html:37 templates/users_questions.html:30
-#: templates/backup/book.html:105 templates/backup/index.html:47
-#: templates/backup/questions.html:45 templates/backup/unanswered.html:36
-#: templates/backup/users_questions.html:29 templates/tough/unanswered.html:35
 msgid "votes"
 msgstr ""
 
-#: templates/book.html:108 templates/backup/book.html:108
+#: templates/book.html:108
 msgid "the answer has been accepted to be correct"
 msgstr ""
 
-#: templates/book.html:115 templates/index.html:48 templates/questions.html:47
+#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
 #: templates/unanswered.html:38 templates/users_questions.html:40
-#: templates/backup/book.html:115 templates/backup/index.html:48
-#: templates/backup/questions.html:46 templates/backup/unanswered.html:37
-#: templates/backup/users_questions.html:39 templates/tough/unanswered.html:36
 msgid "views"
 msgstr ""
 
-#: templates/book.html:125 templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: 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/backup/book.html:125
-#: templates/backup/index.html:68 templates/backup/index.html.py:93
-#: templates/backup/question.html:111 templates/backup/question.html.py:469
-#: templates/backup/questions.html:83 templates/backup/questions.html:148
-#: templates/backup/tags.html:46 templates/backup/unanswered.html:74
-#: templates/backup/unanswered.html:108
-#: templates/backup/users_questions.html:51 templates/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "using tags"
 msgstr ""
 
-#: templates/book.html:147 templates/backup/book.html:147
+#: templates/book.html:147
 msgid "subscribe to book RSS feed"
 msgstr ""
 
 #: templates/book.html:147 templates/index.html:116
-#: templates/backup/book.html:147 templates/backup/index.html:115
 msgid "subscribe to the questions feed"
 msgstr ""
 
 #: templates/close.html:6 templates/close.html.py:16
-#: templates/backup/close.html:6 templates/backup/close.html.py:16
 msgid "Close question"
 msgstr ""
 
-#: templates/close.html:19 templates/backup/close.html:19
+#: templates/close.html:19
 msgid "Close the question"
 msgstr ""
 
-#: templates/close.html:25 templates/backup/close.html:25
+#: templates/close.html:25
 msgid "Reasons"
 msgstr ""
 
-#: templates/close.html:28 templates/backup/close.html:28
+#: templates/close.html:28
 msgid "OK to close"
 msgstr ""
 
-#: templates/faq.html:11 templates/backup/faq.html:11
-#: templates/tough/faq.html:9
+#: templates/faq.html:11
 msgid "Frequently Asked Questions "
 msgstr ""
 
-#: templates/faq.html:15 templates/backup/faq.html:15
-#: templates/tough/faq.html:13
+#: templates/faq.html:16
 msgid "What kinds of questions can I ask here?"
 msgstr ""
 
-#: templates/faq.html:16 templates/backup/faq.html:16
-#: templates/tough/faq.html:14
+#: templates/faq.html:17
 msgid ""
 "Most importanly - questions should be <strong>relevant</strong> to this "
 "community."
 msgstr ""
+"Please ask questions about all aspects of <strong>Magnetic Resonance</"
+"strong> - <strong>NMR</strong>, <strong>EPR</strong>, <strong>MRI</strong>. "
+"Questions about both theory and practice in these fields are welcome, "
+"including questions about the physical foundations, scientific applications, "
+"instrumentation, interpretation of data, software, preparation and handling "
+"of samples etc. "
 
-#: templates/faq.html:17 templates/backup/faq.html:17
-#: templates/tough/faq.html:15
+#: templates/faq.html:18
 msgid ""
 "Before asking the question - please make sure to use search to see whether "
 "your question has alredy been answered."
 msgstr ""
+"Before you ask - please make sure to search for a similar question. You can "
+"search questions by their title or tags."
 
-#: templates/faq.html:20 templates/backup/faq.html:20
-#: templates/tough/faq.html:18
+#: templates/faq.html:21
 msgid "What questions should I avoid asking?"
-msgstr ""
+msgstr "What kinds of questions should be avoided?"
 
-#: templates/faq.html:21 templates/backup/faq.html:21
-#: templates/tough/faq.html:19
+#: templates/faq.html:22
 msgid ""
 "Please avoid asking questions that are not relevant to this community, too "
 "subjective and argumentative."
 msgstr ""
+"Please avoid asking questions that are not relevant to the subjects of NMR, "
+"EPR or MRI, also please avoid asking questions that are too argumentative or "
+"subjective."
 
-#: templates/faq.html:24 templates/backup/faq.html:24
-#: templates/tough/faq.html:22
+#: templates/faq.html:27
 msgid "What should I avoid in my answers?"
 msgstr ""
 
-#: templates/faq.html:25 templates/backup/faq.html:25
-#: templates/tough/faq.html:23
+#: templates/faq.html:28 templates/faq.html.py:132
+msgid "site title"
+msgstr "NMR Wiki Q&A"
+
+#: templates/faq.html:28
 msgid ""
 "is a Q&A site, not a discussion group. Therefore - please avoid having "
 "discussions in your answers, comment facility allows some space for brief "
 "discussions."
 msgstr ""
+"is a <strong>question and answer</strong> site - <strong>it is not a "
+"discussion group</strong>. Please avoid holding debates in your answers as "
+"they tend to dilute the essense of questions and answers. For the brief "
+"discussions please use commenting facility."
 
-#: templates/faq.html:28 templates/backup/faq.html:28
-#: templates/tough/faq.html:26
+#: templates/faq.html:32
 msgid "Who moderates this community?"
 msgstr ""
 
-#: templates/faq.html:29 templates/backup/faq.html:29
-#: templates/tough/faq.html:27
+#: templates/faq.html:33
 msgid "The short answer is: <strong>you</strong>."
 msgstr ""
 
-#: templates/faq.html:30 templates/backup/faq.html:30
-#: templates/tough/faq.html:28
+#: templates/faq.html:34
 msgid "This website is moderated by the users."
 msgstr ""
 
-#: templates/faq.html:31 templates/backup/faq.html:31
-#: templates/tough/faq.html:29
+#: templates/faq.html:35
 msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
 msgstr ""
 
-#: templates/faq.html:34 templates/backup/faq.html:34
-#: templates/tough/faq.html:32
+#: templates/faq.html:40
 msgid "How does reputation system work?"
 msgstr ""
 
-#: templates/faq.html:35 templates/backup/faq.html:35
-#: templates/tough/faq.html:33
-msgid ""
-"Anyone can ask questions and give answers, points are not necessary for that."
+#: templates/faq.html:41
+msgid "Rep system summary"
 msgstr ""
+"When a question or answer is upvoted, the user who posted them will gain "
+"some points, which are called \"reputation points\". These points serve as a "
+"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:36 templates/backup/faq.html:36
-#: templates/tough/faq.html:34
-msgid ""
-"As we've said before, users help running this site. Point system helps "
-"select users who can administer this community."
-msgstr ""
-
-#: templates/faq.html:37 templates/backup/faq.html:37
-#: templates/tough/faq.html:35
-msgid ""
-"Reputation points roughly measure how community trusts you. These points are "
-"given to you directly by other members of the community."
-msgstr ""
-
-#: templates/faq.html:40 templates/backup/faq.html:40
-#: templates/tough/faq.html:38
-msgid ""
-"For example, if you ask an interesting question or give a helpful answer, "
-"your input will be upvoted and you will gain more trust in the community."
-msgstr ""
-
-#: templates/faq.html:41 templates/backup/faq.html:41
-#: templates/tough/faq.html:39
-msgid ""
-"If on the other hand someone gives a misleading answer, the answer will be "
-"voted down and he/she loses some points."
-msgstr ""
-
-#: templates/faq.html:42 templates/backup/faq.html:42
-#: templates/tough/faq.html:40
-msgid ""
-"Each vote in favor will generate <strong>10</strong> points, each vote "
-"against will subtract <strong>2</strong> points."
-msgstr ""
-
-#: templates/faq.html:43 templates/backup/faq.html:43
-#: templates/tough/faq.html:41
-msgid ""
-"Through the votes of other people you can accumulate a maximum of "
-"<strong>200</strong> points."
-msgstr ""
-
-#: templates/faq.html:44 templates/backup/faq.html:44
-msgid "After accumulating certain number of points, you can do more:"
-msgstr ""
-
-#: templates/faq.html:52 templates/user_votes.html:14
-#: templates/backup/faq.html:52 templates/backup/user_votes.html:13
-#: templates/tough/faq.html:50
+#: templates/faq.html:59 templates/user_votes.html:14
 msgid "upvote"
 msgstr ""
 
-#: templates/faq.html:56 templates/backup/faq.html:56
-#: templates/tough/faq.html:54
+#: templates/faq.html:63
 msgid "use tags"
 msgstr ""
 
-#: templates/faq.html:60 templates/backup/faq.html:60
-#: templates/tough/faq.html:58
+#: templates/faq.html:68
 msgid "add comments"
 msgstr ""
 
-#: templates/faq.html:64 templates/user_votes.html:16
-#: templates/backup/faq.html:64 templates/backup/user_votes.html:15
-#: templates/tough/faq.html:62
+#: templates/faq.html:72 templates/user_votes.html:16
 msgid "downvote"
 msgstr ""
 
-#: templates/faq.html:71 templates/backup/faq.html:71
-#: templates/tough/faq.html:69
+#: templates/faq.html:75
+msgid "open and close own questions"
+msgstr ""
+
+#: templates/faq.html:79
 msgid "retag questions"
 msgstr ""
 
-#: templates/faq.html:75 templates/backup/faq.html:75
-#: templates/tough/faq.html:73
+#: templates/faq.html:83
 msgid "edit community wiki questions"
 msgstr ""
 
-#: templates/faq.html:79 templates/backup/faq.html:79
-#: templates/tough/faq.html:77
+#: templates/faq.html:87
 msgid "edit any answer"
 msgstr ""
 
-#: templates/faq.html:83 templates/backup/faq.html:83
-#: templates/tough/faq.html:81
+#: templates/faq.html:91
 msgid "open any closed question"
 msgstr ""
 
-#: templates/faq.html:87 templates/backup/faq.html:87
-#: templates/tough/faq.html:85
+#: templates/faq.html:95
 msgid "delete any comment"
 msgstr ""
 
-#: templates/faq.html:91 templates/backup/faq.html:91
-#: templates/tough/faq.html:89
+#: templates/faq.html:99
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 
-#: templates/faq.html:98 templates/backup/faq.html:98
+#: templates/faq.html:106
+msgid "how to validate email title"
+msgstr "How to validate email and why?"
+
+#: templates/faq.html:108
+msgid "how to validate email info"
+msgstr ""
+"<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
+"\"bigger strong\">How?</span> If you have just set or changed your email "
+"address - <strong>check your email and click the included link</strong>."
+"<br>The link contains a key generated specifically for you. You can also "
+"<button style='display:inline' type='submit'><strong>get a new key</strong></"
+"button> and check your email again.</p></form><span class=\"bigger strong"
+"\">Why?</span> Email validation is required to make sure that <strong>only "
+"you can post messages</strong> on your behalf and to <strong>minimize spam</"
+"strong> posts.<br>With email you can <strong>subscribe for updates</strong> "
+"on the most interesting questions. Also, when you sign up for the first time "
+"- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
+"personal image.</p>"
+
+#: templates/faq.html:112
+msgid "what is gravatar"
+msgstr "What is gravatar?"
+
+#: templates/faq.html:113
+msgid "gravatar faq info"
+msgstr ""
+"<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</"
+"strong>ecognized <strong>avatar</strong> - your unique avatar image "
+"associated with your email address. It's simply a picture that shows next to "
+"your posts on the websites that support gravatar protocol. By default gravar "
+"appears as a square filled with a snowflake-like figure. You can <strong>set "
+"your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</"
+"strong></a>"
+
+#: templates/faq.html:116
 msgid "To register, do I need to create new password?"
 msgstr ""
 
-#: templates/faq.html:99 templates/backup/faq.html:99
-#: templates/tough/faq.html:97
+#: templates/faq.html:117
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
 msgstr ""
 
-#: templates/faq.html:100 templates/backup/faq.html:100
-#: templates/tough/faq.html:98
+#: templates/faq.html:118
 msgid "Login now!"
 msgstr ""
 
-#: templates/faq.html:103 templates/backup/faq.html:103
-#: templates/tough/faq.html:101
+#: templates/faq.html:123
 msgid "Why other people can edit my questions/answers?"
 msgstr ""
 
-#: templates/faq.html:104 templates/backup/faq.html:104
-#: templates/tough/faq.html:102
+#: templates/faq.html:124
 msgid "Goal of this site is..."
 msgstr ""
+"<span class='orange'>NMR Wiki Q&A</span> aims for offering a place for "
+"efficient exchange of ideas among users of <strong>Magnetic Resonance</"
+"strong>and specialists working in this field."
 
-#: templates/faq.html:104 templates/backup/faq.html:104
-#: templates/tough/faq.html:102
+#: templates/faq.html:124
 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 "
 "content."
 msgstr ""
 
-#: templates/faq.html:105 templates/backup/faq.html:105
-#: templates/tough/faq.html:103
+#: templates/faq.html:125
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 
-#: templates/faq.html:107 templates/backup/faq.html:107
-#: templates/tough/faq.html:105
+#: templates/faq.html:129
 msgid "Still have questions?"
 msgstr ""
 
-#: templates/faq.html:108 templates/backup/faq.html:108
+#: templates/faq.html:130
 msgid "Please ask your question, help make our community better!"
 msgstr ""
+"Please <a href=\"/questions/ask\">ask</a> your question, help make our "
+"community better!"
 
-#: templates/faq.html:108 templates/header.html:29 templates/header.html.py:60
-#: templates/backup/faq.html:108 templates/backup/header.html:29
-#: templates/backup/header.html.py:58 templates/tough/faq.html:106
+#: templates/faq.html:132 templates/header.html:29 templates/header.html.py:60
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:108 templates/index.html:121
-#: templates/backup/faq.html:108 templates/backup/index.html:120
-#: templates/tough/faq.html:106
+#: templates/faq.html:132 templates/index.html:121
 msgid "."
 msgstr ""
 
-#: templates/footer.html:7 templates/header.html:12 templates/index.html:83
-#: templates/backup/footer.html:7 templates/backup/header.html:12
-#: templates/backup/index.html:83
+#: templates/footer.html:7 templates/header.html:14 templates/index.html:83
 msgid "about"
 msgstr ""
 
-#: templates/footer.html:8 templates/header.html:13 templates/index.html:84
-#: templates/backup/footer.html:8 templates/backup/header.html:13
-#: templates/backup/index.html:84
+#: templates/footer.html:8 templates/header.html:15 templates/index.html:84
 msgid "faq"
 msgstr ""
 
-#: templates/footer.html:9 templates/backup/footer.html:9
+#: templates/footer.html:9
 msgid "blog"
 msgstr ""
 
-#: templates/footer.html:10 templates/backup/footer.html:10
+#: templates/footer.html:10
 msgid "contact us"
 msgstr ""
 
-#: templates/footer.html:11 templates/backup/footer.html:11
+#: templates/footer.html:11
 msgid "privacy policy"
 msgstr ""
 
-#: templates/footer.html:12 templates/backup/footer.html:12
+#: templates/footer.html:12
 msgid "give feedback"
 msgstr ""
 
-#: templates/footer.html:18 templates/backup/footer.html:18
+#: templates/footer.html:18
 msgid "current revision"
 msgstr ""
 
-#: templates/header.html:8 templates/backup/header.html:8
+#: templates/header.html:10
 msgid "logout"
 msgstr ""
 
-#: templates/header.html:10 templates/authopenid/signup.html:39
-#: templates/backup/header.html:10
+#: templates/header.html:12 templates/authopenid/signup.html:41
 msgid "login"
 msgstr ""
 
-#: templates/header.html:23 templates/backup/header.html:23
+#: templates/header.html:23
 msgid "back to home page"
 msgstr ""
 
 #: templates/header.html:31 templates/header.html.py:62
-#: templates/backup/header.html:31 templates/backup/header.html.py:60
 msgid "users"
 msgstr ""
 
-#: templates/header.html:32 templates/backup/header.html:32
+#: templates/header.html:32
 msgid "books"
 msgstr ""
 
-#: templates/header.html:34 templates/index.html:121
-#: templates/backup/header.html:34 templates/backup/index.html:120
+#: templates/header.html:34
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:38 templates/backup/header.html:37
+#: templates/header.html:38
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:42 templates/backup/header.html:40
+#: templates/header.html:42
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:57 templates/backup/header.html:55
+#: templates/header.html:57
 msgid "search"
 msgstr ""
 
-#: templates/index.html:6 templates/backup/index.html:6
+#: templates/index.html:7
 msgid "Home"
 msgstr ""
 
-#: templates/index.html:7 templates/backup/index.html:7
-msgid "meta site keywords, comma separated"
-msgstr ""
-
-#: templates/index.html:21 templates/questions.html:7
-#: templates/backup/index.html:21 templates/backup/questions.html:6
+#: templates/index.html:22 templates/questions.html:7
 msgid "Questions"
 msgstr ""
 
-#: templates/index.html:23 templates/backup/index.html:23
+#: templates/index.html:24
 msgid "last updated questions"
 msgstr ""
 
-#: templates/index.html:23 templates/questions.html:25
-#: templates/unanswered.html:20 templates/backup/index.html:23
-#: templates/backup/questions.html:24 templates/backup/unanswered.html:19
-#: templates/tough/unanswered.html:18
+#: templates/index.html:24 templates/questions.html:25
+#: templates/unanswered.html:20
 msgid "newest"
 msgstr ""
 
-#: templates/index.html:24 templates/questions.html:27
-#: templates/backup/index.html:24 templates/backup/questions.html:26
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest questions"
 msgstr ""
 
-#: templates/index.html:24 templates/questions.html:27
-#: templates/backup/index.html:24 templates/backup/questions.html:26
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:28
-#: templates/backup/index.html:25 templates/backup/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted questions"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:28
-#: templates/backup/index.html:25 templates/backup/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted"
 msgstr ""
 
-#: templates/index.html:26 templates/backup/index.html:26
+#: templates/index.html:27
 msgid "all questions"
 msgstr ""
 
-#: templates/index.html:46 templates/questions.html:45
+#: templates/index.html:47 templates/questions.html:45
 #: templates/unanswered.html:36 templates/users_questions.html:35
-#: templates/backup/index.html:46 templates/backup/questions.html:44
-#: templates/backup/unanswered.html:35
-#: templates/backup/users_questions.html:34 templates/tough/unanswered.html:34
 msgid "answers"
 msgstr ""
 
-#: templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: 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/backup/index.html:68
-#: templates/backup/index.html.py:93 templates/backup/question.html:111
-#: templates/backup/question.html.py:469 templates/backup/questions.html:83
-#: templates/backup/questions.html:148 templates/backup/tags.html:46
-#: templates/backup/unanswered.html:74 templates/backup/unanswered.html:108
-#: templates/backup/users_questions.html:51 templates/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr ""
 
-#: templates/index.html:79 templates/backup/index.html:79
+#: templates/index.html:80
 msgid "welcome to website"
-msgstr ""
-
-#: templates/index.html:81 templates/backup/index.html:81
-msgid "what is this website"
-msgstr ""
+msgstr "Welcome to NMR Wiki Q&A"
 
-#: templates/index.html:82 templates/backup/index.html:82
-msgid "what can one do on this website"
-msgstr ""
-
-#: templates/index.html:89 templates/backup/index.html:89
+#: templates/index.html:89
 msgid "Recent tags"
 msgstr ""
 
@@ -1468,325 +1351,315 @@ msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
 #: templates/index.html:97 templates/index.html.py:121
-#: templates/backup/index.html:96 templates/backup/index.html.py:120
 msgid "popular tags"
-msgstr ""
+msgstr "tags"
 
-#: templates/index.html:101 templates/backup/index.html:100
+#: templates/index.html:101
 msgid "Recent awards"
-msgstr ""
+msgstr "Recent badges"
 
-#: templates/index.html:107 templates/backup/index.html:106
+#: templates/index.html:107
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:112 templates/backup/index.html:111
+#: templates/index.html:112
 msgid "all awards"
-msgstr ""
+msgstr "all badges"
 
-#: templates/index.html:116 templates/backup/index.html:115
+#: templates/index.html:116
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:121 templates/backup/index.html:120
+#: templates/index.html:121
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:121 templates/backup/index.html:120
-msgid "complete list of quesionts"
-msgstr ""
+#: templates/index.html:121
+msgid "complete list of questions"
+msgstr "list of all questions"
 
-#: templates/index.html:121 templates/backup/index.html:120
+#: templates/index.html:121
 msgid "or"
 msgstr ""
 
-#: templates/index.html:121 templates/backup/index.html:120
+#: templates/index.html:121
 msgid "Please help us answer"
 msgstr ""
 
+#: templates/index.html:121
+msgid "list of unanswered questions"
+msgstr "unanswered questions"
+
 #: templates/logout.html:6 templates/logout.html.py:17
-#: templates/backup/logout.html:6 templates/backup/logout.html.py:17
 msgid "Logout"
 msgstr ""
 
-#: templates/logout.html:20 templates/backup/logout.html:20
+#: 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 ""
+"Clicking <strong>Logout</strong> will log you out from NMR Wiki Q&A.</"
+"p><p>If you wish to sign off completely - please make sure to log out from "
+"your OpenID provider."
 
-#: templates/logout.html:21 templates/backup/logout.html:21
+#: templates/logout.html:21
 msgid "Logout now"
-msgstr ""
+msgstr "Logout Now"
 
-#: templates/pagesize.html:6 templates/backup/pagesize.html:6
+#: templates/pagesize.html:6
 msgid "posts per page"
 msgstr ""
 
 #: templates/paginator.html:6 templates/paginator.html.py:7
-#: templates/backup/paginator.html:5 templates/backup/paginator.html.py:6
 msgid "previous"
 msgstr ""
 
-#: templates/paginator.html:20 templates/backup/paginator.html:19
+#: templates/paginator.html:19
 msgid "current page"
 msgstr ""
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
-#: templates/backup/paginator.html:22 templates/backup/paginator.html.py:29
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "page number "
 msgstr ""
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
-#: templates/backup/paginator.html:22 templates/backup/paginator.html.py:29
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "number - make blank in english"
 msgstr ""
 
-#: templates/paginator.html:34 templates/backup/paginator.html:33
+#: templates/paginator.html:33
 msgid "next page"
 msgstr ""
 
 #: templates/privacy.html:6 templates/privacy.html.py:11
-#: templates/backup/privacy.html:5 templates/backup/privacy.html.py:10
 msgid "Privacy policy"
 msgstr ""
 
-#: templates/privacy.html:15 templates/backup/privacy.html:14
+#: templates/privacy.html:15
 msgid "general message about privacy"
 msgstr ""
 
-#: templates/privacy.html:18 templates/backup/privacy.html:17
+#: templates/privacy.html:18
 msgid "Site Visitors"
 msgstr ""
 
-#: templates/privacy.html:20 templates/backup/privacy.html:19
+#: templates/privacy.html:20
 msgid "what technical information is collected about visitors"
 msgstr ""
 
-#: templates/privacy.html:23 templates/backup/privacy.html:22
+#: templates/privacy.html:23
 msgid "Personal Information"
 msgstr ""
 
-#: templates/privacy.html:25 templates/backup/privacy.html:24
+#: templates/privacy.html:25
 msgid "details on personal information policies"
 msgstr ""
 
-#: templates/privacy.html:28 templates/backup/privacy.html:27
+#: templates/privacy.html:28
 msgid "Other Services"
 msgstr ""
 
-#: templates/privacy.html:30 templates/backup/privacy.html:29
+#: templates/privacy.html:30
 msgid "details on sharing data with third parties"
 msgstr ""
 
-#: templates/privacy.html:35 templates/backup/privacy.html:34
+#: templates/privacy.html:35
 msgid "cookie policy details"
 msgstr ""
 
-#: templates/privacy.html:37 templates/backup/privacy.html:36
+#: templates/privacy.html:37
 msgid "Policy Changes"
 msgstr ""
 
-#: templates/privacy.html:38 templates/backup/privacy.html:37
+#: templates/privacy.html:38
 msgid "how privacy policies can be changed"
 msgstr ""
 
-#: templates/question.html:66 templates/question.html.py:78
-#: templates/backup/question.html:65 templates/backup/question.html.py:77
+#: templates/question.html:69 templates/question.html.py:81
 msgid "i like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:68 templates/question.html.py:80
-#: templates/question.html:273 templates/backup/question.html:67
-#: templates/backup/question.html.py:79 templates/backup/question.html:272
+#: templates/question.html:71 templates/question.html.py:83
+#: templates/question.html:276
 msgid "current number of votes"
 msgstr ""
 
-#: templates/question.html:73 templates/question.html.py:84
-#: templates/backup/question.html:72 templates/backup/question.html.py:83
+#: templates/question.html:76 templates/question.html.py:87
 msgid "i dont like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:90 templates/backup/question.html:89
+#: templates/question.html:93
 msgid "mark this question as favorite (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:96 templates/backup/question.html:95
+#: templates/question.html:99
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 
-#: templates/question.html:121 templates/question.html.py:304
+#: templates/question.html:124 templates/question.html.py:307
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
-#: templates/backup/question.html:120 templates/backup/question.html.py:303
-#: templates/backup/revisions_answer.html:52
-#: templates/backup/revisions_question.html:51
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:125 templates/question.html.py:314
-#: templates/backup/question.html:124 templates/backup/question.html.py:307
+#: templates/question.html:128 templates/question.html.py:317
 msgid "delete"
 msgstr ""
 
-#: templates/question.html:130 templates/backup/question.html:129
+#: templates/question.html:133
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:135 templates/backup/question.html:134
+#: templates/question.html:138
 msgid "close"
 msgstr ""
 
-#: templates/question.html:141 templates/question.html.py:327
-#: templates/backup/question.html:140 templates/backup/question.html.py:317
+#: templates/question.html:144 templates/question.html.py:330
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 
-#: templates/question.html:142 templates/question.html.py:328
-#: templates/backup/question.html:141 templates/backup/question.html.py:318
+#: templates/question.html:145 templates/question.html.py:331
 msgid "flag offensive"
 msgstr ""
 
-#: templates/question.html:154 templates/question.html.py:337
+#: templates/question.html:157 templates/question.html.py:340
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
-#: templates/backup/question.html:153 templates/backup/question.html.py:327
-#: templates/backup/revisions_answer.html:64
-#: templates/backup/revisions_question.html:63
 msgid "updated"
 msgstr ""
 
-#: templates/question.html:203 templates/question.html.py:384
+#: templates/question.html:206 templates/question.html.py:387
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
-#: templates/backup/question.html:202 templates/backup/question.html.py:374
-#: templates/backup/revisions_answer.html:62
-#: templates/backup/revisions_question.html:61
 msgid "asked"
 msgstr ""
 
-#: templates/question.html:233 templates/question.html.py:411
-#: templates/backup/question.html:232 templates/backup/question.html.py:401
+#: templates/question.html:236 templates/question.html.py:414
 msgid "comments"
 msgstr ""
 
-#: templates/question.html:234 templates/question.html.py:412
-#: templates/backup/question.html:233 templates/backup/question.html.py:402
+#: templates/question.html:237 templates/question.html.py:415
 msgid "add comment"
 msgstr ""
 
-#: templates/question.html:247 templates/backup/question.html:246
+#: templates/question.html:250
 #, python-format
 msgid ""
 "The question has been closed for the following reason \"%(question."
 "get_close_reason_display)s\" by"
 msgstr ""
 
-#: templates/question.html:249 templates/backup/question.html:248
+#: templates/question.html:252
 #, python-format
 msgid "close date %(question.closed_at)s"
 msgstr ""
 
-#: templates/question.html:256 templates/user_stats.html:28
-#: templates/backup/question.html:255 templates/backup/user_stats.html:27
+#: templates/question.html:259 templates/user_stats.html:28
 msgid "Answers"
 msgstr " Answers"
 
-#: templates/question.html:258 templates/backup/question.html:257
+#: templates/question.html:261
 msgid "oldest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:258 templates/backup/question.html:257
+#: templates/question.html:261
 msgid "oldest answers"
 msgstr "oldest"
 
-#: templates/question.html:259 templates/backup/question.html:258
+#: templates/question.html:262
 msgid "newest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:259 templates/backup/question.html:258
+#: templates/question.html:262
 msgid "newest answers"
 msgstr "newest"
 
-#: templates/question.html:260 templates/backup/question.html:259
+#: templates/question.html:263
 msgid "most voted answers will be shown first"
 msgstr ""
 
-#: templates/question.html:260 templates/backup/question.html:259
+#: templates/question.html:263
 msgid "popular answers"
 msgstr "most voted"
 
-#: templates/question.html:272 templates/backup/question.html:271
+#: templates/question.html:275
 msgid "i like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:278 templates/backup/question.html:277
+#: templates/question.html:281
 msgid "i dont like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:284 templates/backup/question.html:283
+#: templates/question.html:287
 msgid "mark this answer as favorite (click again to undo)"
 msgstr ""
 
-#: templates/question.html:289 templates/backup/question.html:288
+#: templates/question.html:292
 msgid "the author of the question has selected this answer as correct"
 msgstr ""
 
-#: templates/question.html:311
+#: templates/question.html:314
 msgid "undelete"
 msgstr ""
 
-#: templates/question.html:321 templates/backup/question.html:311
+#: templates/question.html:324
 msgid "answer permanent link"
 msgstr ""
 
-#: templates/question.html:322 templates/backup/question.html:312
+#: templates/question.html:325
 msgid "permanent link"
 msgstr ""
 
-#: templates/question.html:436 templates/backup/question.html:426
+#: templates/question.html:438
 msgid "Your answer"
 msgstr ""
 
-#: templates/question.html:460 templates/backup/question.html:450
+#: templates/question.html:441
+msgid "you can answer anonymously and then login"
+msgstr ""
+"<span class='strong big'>You are now not logged in</span> but you can answer "
+"first and then login"
+
+#: templates/question.html:465
 msgid "Answer the question"
 msgstr ""
 
-#: templates/question.html:462 templates/backup/question.html:452
-msgid "Login to answer"
+#: templates/question.html:467
+msgid "Notify me daily if there are any new answers."
 msgstr ""
 
-#: templates/question.html:474 templates/backup/question.html:464
+#: templates/question.html:469
+msgid "once you sign in you will be able to subscribe for any updates here"
+msgstr "Here logged in users can sign up for the question updates."
+
+#: templates/question.html:481
 msgid "Question tags"
 msgstr "Tags"
 
-#: templates/question.html:484 templates/backup/question.html:474
+#: templates/question.html:491
 msgid "question asked"
 msgstr "Asked"
 
-#: templates/question.html:484 templates/question.html.py:490
-#: templates/user_info.html:51 templates/backup/question.html:474
-#: templates/backup/question.html.py:480 templates/backup/user_info.html:50
+#: templates/question.html:491 templates/question.html.py:497
+#: templates/user_info.html:51
 msgid "ago"
 msgstr ""
 
-#: templates/question.html:487 templates/backup/question.html:477
+#: templates/question.html:494
 msgid "question was seen"
 msgstr "Seen"
 
-#: templates/question.html:487 templates/backup/question.html:477
+#: templates/question.html:494
 msgid "times"
 msgstr ""
 
-#: templates/question.html:490 templates/backup/question.html:480
+#: templates/question.html:497
 msgid "last updated"
 msgstr "Last updated"
 
-#: templates/question.html:495 templates/backup/question.html:485
+#: templates/question.html:502
 msgid "Related questions"
 msgstr ""
 
 #: templates/question_edit.html:4 templates/question_edit.html.py:65
-#: templates/backup/question_edit.html:2
-#: templates/backup/question_edit.html:63
 msgid "Edit question"
 msgstr ""
 
@@ -1795,38 +1668,54 @@ msgid "question tips"
 msgstr "Tips"
 
 #: templates/question_edit_tips.html:7
-#: templates/backup/question_edit_tips.html:5
 msgid "please ask a relevant question"
 msgstr ""
 
 #: templates/question_edit_tips.html:10
-#: templates/backup/question_edit_tips.html:8
 msgid "please try provide enough details"
 msgstr "provide enough details"
 
-#: templates/questions.html:23 templates/backup/questions.html:22
+#: templates/question_retag.html:3 templates/question_retag.html.py:52
+msgid "Change tags"
+msgstr ""
+
+#: templates/question_retag.html:39
+msgid "up to 5 tags, less than 20 characters each"
+msgstr ""
+
+#: templates/question_retag.html:86
+msgid "Why use and modify tags?"
+msgstr ""
+
+#: templates/question_retag.html:89
+msgid "tags help us keep Questions organized"
+msgstr ""
+
+#: templates/question_retag.html:95
+msgid "tag editors receive special awards from the community"
+msgstr ""
+
+#: templates/questions.html:23
 msgid "Found by tags"
 msgstr "Tagged questions"
 
-#: templates/questions.html:23 templates/backup/questions.html:22
+#: templates/questions.html:23
 msgid "Found by title"
 msgstr ""
 
-#: templates/questions.html:23 templates/backup/questions.html:22
+#: templates/questions.html:23
 msgid "All questions"
 msgstr ""
 
 #: templates/questions.html:25 templates/unanswered.html:20
-#: templates/backup/questions.html:24 templates/backup/unanswered.html:19
-#: templates/tough/unanswered.html:18
 msgid "most recently asked questions"
 msgstr ""
 
-#: templates/questions.html:26 templates/backup/questions.html:25
+#: templates/questions.html:26
 msgid "most recently updated questions"
 msgstr ""
 
-#: templates/questions.html:26 templates/backup/questions.html:25
+#: templates/questions.html:26
 msgid "active"
 msgstr ""
 
@@ -1846,19 +1735,19 @@ msgstr[0] ""
 "class=\"tag\">%(tagname)s</span></p>"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</"
-"p><p><span class=\"tag\">%(tagname)s</span></p>"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
+"class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
 
 #: templates/questions.html:116
 #, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgid_plural ""
 "\n"
-"\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgstr[0] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>question with title "
@@ -1870,114 +1759,121 @@ msgstr[1] ""
 "containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
 "p>"
 
-#: templates/questions.html:124
+#: templates/questions.html:122
+#, python-format
+msgid ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgid_plural ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgstr[0] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>question</p>"
+msgstr[1] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
+
+#: templates/questions.html:131
 msgid "latest questions info"
 msgstr "<strong>Newest</strong> questions are shown first."
 
-#: templates/questions.html:128 templates/backup/questions.html:127
+#: templates/questions.html:135
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 
-#: templates/questions.html:129 templates/backup/questions.html:128
+#: templates/questions.html:136
 msgid "Most recently answered ones are shown first."
-msgstr ""
+msgstr "<strong>Most recently answered</strong> questions are shown first."
 
-#: templates/questions.html:133 templates/backup/questions.html:132
+#: templates/questions.html:140
 msgid "Questions sorted by <strong>number of responses</strong>."
-msgstr ""
+msgstr "Questions sorted by the <strong>number of answers</strong>."
 
-#: templates/questions.html:134 templates/backup/questions.html:133
+#: templates/questions.html:141
 msgid "Most answered questions are shown first."
-msgstr ""
+msgstr " "
 
-#: templates/questions.html:138 templates/backup/questions.html:137
+#: templates/questions.html:145
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr ""
 
-#: templates/questions.html:139 templates/backup/questions.html:138
+#: templates/questions.html:146
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:146 templates/unanswered.html:105
-#: templates/backup/questions.html:145 templates/backup/unanswered.html:104
-#: templates/tough/unanswered.html:101
+#: templates/questions.html:153 templates/unanswered.html:105
 msgid "Related tags"
 msgstr "Tags"
 
 #: templates/reopen.html:6 templates/reopen.html.py:16
-#: templates/backup/reopen.html:4 templates/backup/reopen.html.py:14
 msgid "Reopen question"
 msgstr ""
 
-#: templates/reopen.html:19 templates/backup/reopen.html:17
+#: templates/reopen.html:19
 msgid "Open the previously closed question"
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "The question was closed for the following reason "
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "reason - leave blank in english"
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "on "
 msgstr ""
 
-#: templates/reopen.html:22 templates/backup/reopen.html:20
+#: templates/reopen.html:22
 msgid "date closed"
 msgstr ""
 
-#: templates/reopen.html:29 templates/backup/reopen.html:27
+#: templates/reopen.html:29
 msgid "Reopen this question"
 msgstr ""
 
 #: templates/revisions_answer.html:7 templates/revisions_answer.html.py:36
 #: templates/revisions_question.html:8 templates/revisions_question.html:36
-#: templates/backup/revisions_answer.html:6
-#: templates/backup/revisions_answer.html:35
-#: templates/backup/revisions_question.html:6
-#: templates/backup/revisions_question.html:34
 msgid "Revision history"
 msgstr ""
 
 #: templates/tags.html:6 templates/tags.html.py:29
-#: templates/backup/tags.html:5 templates/backup/tags.html.py:28
 msgid "Tag list"
 msgstr ""
 
-#: templates/tags.html:31 templates/backup/tags.html:30
+#: templates/tags.html:31
 msgid "sorted alphabetically"
 msgstr ""
 
-#: templates/tags.html:31 templates/backup/tags.html:30
+#: templates/tags.html:31
 msgid "by name"
 msgstr ""
 
-#: templates/tags.html:32 templates/backup/tags.html:31
+#: templates/tags.html:32
 msgid "sorted by frequency of tag use"
 msgstr ""
 
-#: templates/tags.html:32 templates/backup/tags.html:31
+#: templates/tags.html:32
 msgid "by popularity"
 msgstr ""
 
-#: templates/tags.html:38 templates/backup/tags.html:37
+#: templates/tags.html:38
 msgid "All tags matching query"
 msgstr ""
 
-#: templates/tags.html:38 templates/backup/tags.html:37
+#: templates/tags.html:38
 msgid "all tags - make this empty in english"
 msgstr ""
 
-#: templates/tags.html:41 templates/backup/tags.html:40
+#: templates/tags.html:41
 msgid "Nothing found"
 msgstr ""
 
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
-#: templates/backup/unanswered.html:6 templates/backup/unanswered.html:17
-#: templates/tough/unanswered.html:5 templates/tough/unanswered.html.py:16
 msgid "Unanswered questions"
 msgstr ""
 
@@ -1988,41 +1884,39 @@ msgstr ""
 "<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
 "questions"
 
-#: templates/unanswered.html:99 templates/backup/questions.html:107
-#: templates/backup/unanswered.html:97
+#: templates/unanswered.html:99
 msgid "Have a total of"
 msgstr ""
 
-#: templates/user_edit.html:6 templates/backup/user_edit.html:4
+#: templates/user_edit.html:6
 msgid "Edit user profile"
 msgstr ""
 
-#: templates/user_edit.html:19 templates/backup/user_edit.html:17
+#: templates/user_edit.html:19
 msgid "edit profile"
 msgstr ""
 
-#: templates/user_edit.html:31 templates/backup/user_edit.html:29
+#: templates/user_edit.html:31
 msgid "image associated with your email address"
 msgstr ""
 
-#: templates/user_edit.html:31 templates/backup/user_edit.html:29
+#: templates/user_edit.html:31
 msgid "avatar"
-msgstr ""
+msgstr "<a href='/faq#gravatar'>gravatar</a>"
 
 #: templates/user_edit.html:36 templates/user_info.html:31
-#: templates/backup/user_edit.html:34 templates/backup/user_info.html:30
 msgid "Registered user"
 msgstr ""
 
-#: templates/user_edit.html:82 templates/backup/user_edit.html:80
+#: templates/user_edit.html:82
 msgid "Update"
 msgstr ""
 
-#: templates/user_info.html:34 templates/backup/user_info.html:33
+#: templates/user_info.html:34
 msgid "update profile"
 msgstr ""
 
-#: templates/user_info.html:40 templates/backup/user_info.html:39
+#: templates/user_info.html:40
 msgid "real name"
 msgstr ""
 
@@ -2030,35 +1924,59 @@ msgstr ""
 msgid "member for"
 msgstr ""
 
-#: templates/user_info.html:50 templates/backup/user_info.html:49
+#: templates/user_info.html:50
 msgid "last seen"
 msgstr ""
 
-#: templates/user_info.html:56 templates/backup/user_info.html:55
+#: templates/user_info.html:56
 msgid "user website"
 msgstr ""
 
-#: templates/user_info.html:62 templates/backup/user_info.html:61
+#: templates/user_info.html:62
 msgid "location"
 msgstr ""
 
-#: templates/user_info.html:69 templates/backup/user_info.html:68
+#: templates/user_info.html:69
 msgid "age"
 msgstr ""
 
-#: templates/user_info.html:70 templates/backup/user_info.html:69
+#: templates/user_info.html:70
 msgid "age unit"
-msgstr ""
+msgstr "years old"
 
-#: templates/user_info.html:75 templates/backup/user_info.html:74
+#: templates/user_info.html:76
 msgid "todays unused votes"
 msgstr ""
 
-#: templates/user_info.html:76 templates/backup/user_info.html:75
+#: templates/user_info.html:77
 msgid "votes left"
 msgstr ""
 
-#: templates/user_stats.html:15 templates/backup/user_stats.html:14
+#: templates/user_preferences.html:10
+msgid "Connect with Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:12
+msgid "Twitter account name:"
+msgstr ""
+
+#: templates/user_preferences.html:14
+msgid "Twitter password:"
+msgstr ""
+
+#: templates/user_preferences.html:16
+msgid "Send my Questions to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:17
+msgid "Send my Answers to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:18
+msgid "Save"
+msgstr ""
+
+#: templates/user_stats.html:15
 msgid "User questions"
 msgstr ""
 
@@ -2067,198 +1985,268 @@ msgstr ""
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:37 templates/backup/user_stats.html:36
+#: templates/user_stats.html:37
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:43 templates/backup/user_stats.html:42
+#: templates/user_stats.html:43
 #, python-format
 msgid "the answer has been commented %(answered_question.comment_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:56 templates/backup/user_stats.html:55
+#: templates/user_stats.html:56
 msgid "votes total"
 msgstr "Votes"
 
-#: templates/user_stats.html:65 templates/backup/user_stats.html:64
+#: templates/user_stats.html:65
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:70 templates/backup/user_stats.html:69
+#: templates/user_stats.html:70
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:84 templates/backup/user_stats.html:83
+#: templates/user_stats.html:84
 msgid "Tags"
 msgstr ""
 
-#: templates/user_stats.html:94 templates/backup/user_stats.html:93
+#: templates/user_stats.html:94
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
 
-#: templates/user_tabs.html:7 templates/backup/user_tabs.html:6
+#: templates/user_tabs.html:7
 msgid "User profile"
 msgstr ""
 
-#: templates/user_tabs.html:16 templates/backup/user_tabs.html:15
+#: templates/user_tabs.html:16
 msgid "graph of user reputation"
 msgstr ""
 
-#: templates/user_tabs.html:17 templates/backup/user_tabs.html:16
+#: templates/user_tabs.html:17
 msgid "reputation history"
 msgstr ""
 
-#: templates/user_tabs.html:24 templates/backup/user_tabs.html:23
+#: templates/user_tabs.html:24
 msgid "favorites"
 msgstr ""
 
-#: templates/user_tabs.html:29 templates/backup/user_tabs.html:28
+#: templates/user_tabs.html:28
 msgid "settings"
 msgstr ""
 
 #: templates/users.html:6 templates/users.html.py:24
-#: templates/backup/users.html:5 templates/backup/users.html.py:23
 msgid "Users"
 msgstr ""
 
-#: templates/users.html:27 templates/backup/users.html:26
+#: templates/users.html:27
 msgid "recent"
 msgstr ""
 
-#: templates/users.html:28 templates/backup/users.html:27
+#: templates/users.html:28
 msgid "oldest"
 msgstr ""
 
-#: templates/users.html:29 templates/backup/users.html:28
+#: templates/users.html:29
 msgid "by username"
 msgstr ""
 
-#: templates/users.html:35 templates/backup/users.html:34
+#: templates/users.html:35
 #, python-format
 msgid "users matching query %(suser)s:"
 msgstr ""
 
-#: templates/users.html:39 templates/backup/users.html:38
+#: templates/users.html:39
 msgid "Nothing found."
 msgstr ""
 
-#: templates/users_questions.html:11 templates/backup/users_questions.html:10
+#: templates/users_questions.html:11
 msgid "this questions was selected as favorite"
 msgstr ""
 
-#: templates/users_questions.html:33 templates/backup/users_questions.html:32
+#: templates/users_questions.html:33
 msgid "this answer has been accepted to be correct"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:6
-msgid "Account: change email"
-msgstr ""
+#: templates/authopenid/changeemail.html:7
+#: templates/authopenid/changeemail.html:33
+msgid "Change email"
+msgstr "Change Email"
 
-#: templates/authopenid/changeemail.html:9
-msgid ""
-"This is where you can change the email address associated with your account. "
-"Please keep this email address up to date so we can send you a password-"
-"reset email if you request one."
+#: templates/authopenid/changeemail.html:10
+#, python-format
+msgid "change %(email)s info"
 msgstr ""
+"<span class=\"strong big\">Enter your new email into the box below</span> if "
+"you'd like to use another email for <strong>update subscriptions</strong>."
+"<br>Currently you are using <strong>%(email)s</strong>"
 
-#: 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
+#: templates/authopenid/changeemail.html:13
+#: templates/authopenid/changeopenid.html:14
+#: templates/authopenid/changepw.html:19 templates/authopenid/delete.html:15
+#: templates/authopenid/delete.html:25
 msgid "Please correct errors below:"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:28
-msgid "Email"
+#: templates/authopenid/changeemail.html:30
+msgid "Your new Email"
 msgstr ""
+"<strong>Your new Email:</strong> (will <strong>not</strong> be shown to "
+"anyone, must be valid)"
 
-#: templates/authopenid/changeemail.html:29
-#: templates/authopenid/signin.html:59
+#: templates/authopenid/changeemail.html:31
+#: templates/authopenid/signin.html:138
 msgid "Password"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:31
-msgid "Change email"
+#: templates/authopenid/changeemail.html:42
+msgid "Validate email"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:45
+#, python-format
+msgid "validate %(email)s info"
+msgstr ""
+"<span class=\"strong big\">An email with a validation link has been sent to %"
+"(email)s.</span> Please <strong>follow the emailed link</strong> with your "
+"web browser. Email validation is necessary to help insure the proper use of "
+"email on <span class=\"orange\">NMR Wiki Q&A</span>. If you would like to "
+"use <strong>another email</strong>, please <a href=\"/email/change/"
+"\"><strong>change it again</strong></a>."
+
+#: templates/authopenid/changeemail.html:50
+msgid "Email not changed"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:53
+#, python-format
+msgid "old %(email)s kept"
+msgstr ""
+"<span class=\"strong big\">Your email address %(email)s has not been changed."
+"</span> If you decide to change it later - you can always do it by editing "
+"it in your user profile or by using the <a href=\"/email/change/"
+"\"><strong>previous form</strong></a> again."
+
+#: templates/authopenid/changeemail.html:58
+msgid "Email changed"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:7
+#: templates/authopenid/changeemail.html:61
+#, python-format
+msgid "your current %(email)s can be used for this"
+msgstr ""
+"<span class='big strong'>Your email address is now set to %(email)s.</span> "
+"Updates on the questions that you like most will be sent to this address. "
+"Email notifications are sent once a day or less frequently - only when there "
+"are any news."
+
+#: templates/authopenid/changeemail.html:66
+msgid "Email verified"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:69
+msgid "thanks for verifying email"
+msgstr ""
+"<span class=\"big strong\">Thank you for verifying your email!</span> Now "
+"you can <strong>ask</strong> and <strong>answer</strong> questions. Also if "
+"you find a very interesting question you can <strong>subscribe for the "
+"updates</strong> - then will be notified about changes <strong>once a day</"
+"strong> or less frequently."
+
+#: templates/authopenid/changeemail.html:74
+msgid "email key not sent"
+msgstr "Validation email not sent"
+
+#: templates/authopenid/changeemail.html:77
+#, python-format
+msgid "email key not sent %(email)s change email here %(change_link)s"
+msgstr ""
+"<span class='big strong'>Your current email address %(email)s has been "
+"validated before</span> so the new key was not sent. You can <a href='%"
+"(change_link)s'>change</a> email used for update subscriptions if necessary."
+
+#: templates/authopenid/changeopenid.html:8
 msgid "Account: change OpenID URL"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:11
+#: templates/authopenid/changeopenid.html:12
 msgid ""
 "This is where you can change your OpenID URL. Make sure you remember it!"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:28
+#: templates/authopenid/changeopenid.html:29
 msgid "OpenID URL:"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:29
+#: templates/authopenid/changeopenid.html:30
 msgid "Change OpenID"
 msgstr ""
 
-#: templates/authopenid/changepw.html:13
+#: templates/authopenid/changepw.html:14
 msgid "Account: change password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:16
+#: templates/authopenid/changepw.html:17
 msgid "This is where you can change your password. Make sure you remember it!"
 msgstr ""
 
-#: templates/authopenid/changepw.html:26
+#: templates/authopenid/changepw.html:27
 msgid "Current password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:27
+#: templates/authopenid/changepw.html:28
 msgid "New password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:28
+#: templates/authopenid/changepw.html:29
 msgid "New password again"
 msgstr ""
 
-#: templates/authopenid/changepw.html:29 templates/authopenid/settings.html:28
+#: templates/authopenid/changepw.html:30 templates/authopenid/settings.html:29
 msgid "Change password"
 msgstr ""
 
-#: templates/authopenid/complete.html:4
+#: templates/authopenid/complete.html:5
 msgid "Connect your OpenID with this site"
-msgstr ""
+msgstr "New user signup"
 
-#: templates/authopenid/complete.html:7
+#: templates/authopenid/complete.html:8
 msgid "Connect your OpenID with your account on this site"
-msgstr ""
+msgstr "New user signup"
 
-#: templates/authopenid/complete.html:10
-msgid "Your OpenID is accepted. Please complete this to finish registration."
+#: templates/authopenid/complete.html:12
+#, python-format
+msgid "register new %(provider)s account info"
 msgstr ""
+"<p><span class=\"big strong\">You are here for the first time with your %"
+"(provider)s login.</span> Please create your <strong>screen name</strong> "
+"and save your <strong>email</strong> address. Saved email address will let "
+"you <strong>subscribe for the updates</strong> on the most interesting "
+"questions and will be used to create and retrieve your unique avatar image - "
+"<a href='/faq#gravatar'><strong>gravatar</strong></a>."
 
-#: templates/authopenid/complete.html:11
+#: templates/authopenid/complete.html:14
 msgid "This account already exists, please use another."
 msgstr ""
 
-#: templates/authopenid/complete.html:16 templates/authopenid/complete.html:29
-#: templates/authopenid/signin.html:42
+#: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
+#: templates/authopenid/signin.html:121
 msgid "Sorry, looks like we have some errors:"
 msgstr ""
 
-#: templates/authopenid/complete.html:45
-msgid "New account"
-msgstr ""
-
-#: templates/authopenid/complete.html:46
-msgid "User name (<i>will be shown to others, cannot be modified</i>)"
-msgstr ""
-
 #: templates/authopenid/complete.html:47
-msgid "Email (<i>not shared with anyone</i>)"
-msgstr ""
+msgid "Screen name label"
+msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)"
 
 #: templates/authopenid/complete.html:48
-msgid "create account"
+msgid "Email address label"
 msgstr ""
+"<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with "
+"anyone, must be valid</i>)"
+
+#: templates/authopenid/complete.html:49
+msgid "create account"
+msgstr "Signup"
 
 #: templates/authopenid/complete.html:56
 msgid "Existing account"
@@ -2276,265 +2264,328 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:61
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr ""
 
-#: templates/authopenid/delete.html:8
+#: templates/authopenid/confirm_email.txt:2
+msgid "Thank you for registering at our Q&A forum!"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:4
+msgid "Your account details are:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:6
+#: templates/authopenid/sendpw_email.txt:7
+msgid "Username:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:7
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:9
+msgid "Please sign in here:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:12
+#: templates/authopenid/email_validation.txt:14
+#: templates/authopenid/sendpw_email.txt:13
+msgid ""
+"Sincerely,\n"
+"Forum Administrator"
+msgstr ""
+
+#: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr ""
 
-#: templates/authopenid/delete.html:12
+#: templates/authopenid/delete.html:13
 msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
 msgstr ""
 
-#: templates/authopenid/delete.html:16
+#: templates/authopenid/delete.html:17
 msgid "Check confirm box, if you want delete your account."
 msgstr ""
 
-#: templates/authopenid/delete.html:19
-msgid "Password:"
-msgstr ""
-
-#: templates/authopenid/delete.html:31
+#: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr ""
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "Password/OpenID URL"
 msgstr ""
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "(required for your security)"
 msgstr ""
 
-#: templates/authopenid/delete.html:34
+#: templates/authopenid/delete.html:35
 msgid "Delete account permanently"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:3 templates/authopenid/sendpw.html.py:7
+#: templates/authopenid/email_validation.txt:2
+msgid "Greetings from the Q&A forum"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:4
+msgid "To make use of the Forum, please follow the link below:"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:8
+msgid "Following the link above will help us verify your email address."
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:10
+msgid ""
+"If you beleive that this message was sent in mistake - \n"
+"no further action is needed. Just ingore this email, we apologize\n"
+"for any inconvenience"
+msgstr ""
+
+#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:11
+#: templates/authopenid/sendpw.html:12
 msgid "Lost your password? No problem - here you can reset it."
 msgstr ""
 
-#: templates/authopenid/sendpw.html:12
+#: templates/authopenid/sendpw.html:13
 msgid ""
 "Please enter your username below and new password will be sent to your "
 "registered e-mail"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:29
+#: templates/authopenid/sendpw.html:28
+msgid "User name"
+msgstr ""
+
+#: templates/authopenid/sendpw.html:30
 msgid "Reset password"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:29
+#: templates/authopenid/sendpw.html:30
 msgid "return to login"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:32
+#: templates/authopenid/sendpw.html:33
 msgid ""
 "Note: your new password will be activated only after you click the "
 "activation link in the email message"
 msgstr ""
 
-#: templates/authopenid/settings.html:29
-msgid "Give your  account a new password."
+#: templates/authopenid/sendpw_email.txt:2
+#, python-format
+msgid ""
+"Someone has requested to reset your password on %(site_url)s.\n"
+"If it were not you, it is safe to ignore this email."
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:5
+msgid "Your new account details are:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:8
+msgid "New password:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:10
+msgid "To confirm that you wanted to reset your password please visit:"
 msgstr ""
 
 #: templates/authopenid/settings.html:30
-msgid "Change email "
+msgid "Give your  account a new password."
 msgstr ""
 
 #: templates/authopenid/settings.html:31
+msgid "Change email "
+msgstr ""
+
+#: templates/authopenid/settings.html:32
 msgid "Add or update the email address associated with your account."
 msgstr ""
 
-#: templates/authopenid/settings.html:34
+#: templates/authopenid/settings.html:35
 msgid "Change openid associated to your account"
 msgstr ""
 
-#: templates/authopenid/settings.html:37
+#: templates/authopenid/settings.html:38
 msgid "Delete account"
 msgstr ""
 
-#: templates/authopenid/settings.html:38
+#: templates/authopenid/settings.html:39
 msgid "Erase your username and all your data from website"
 msgstr ""
 
-#: templates/authopenid/signin.html:3 templates/authopenid/signin.html:16
+#: templates/authopenid/signin.html:4 templates/authopenid/signin.html:21
 msgid "User login"
+msgstr "User login"
+
+#: templates/authopenid/signin.html:28
+#, python-format
+msgid ""
+"\n"
+"                Your answer to %(title)s %(summary)s will be posted once you "
+"log in\n"
+"                "
 msgstr ""
+"\n"
+"<span class=\"strong big\">Your answer to </span> <i>\"<strong>%(title)s</"
+"strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
+"posted once you log in.</span>"
 
-#: templates/authopenid/signin.html:21
-msgid "we support two login modes"
+#: templates/authopenid/signin.html:35
+#, python-format
+msgid ""
+"Your question \n"
+"                %(title)s %(summary)s will be posted once you log in\n"
+"                "
 msgstr ""
-"You can log in either through one of these services or traditionally - using "
-"local username/password."
+"<span class=\"strong big\">Your question</span> <i>\"<strong>%(title)s</"
+"strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
+"posted once you log in.</span>"
 
-#: templates/authopenid/signin.html:26 templates/authopenid/signup.html:49
-msgid "Login with your OpenID"
+#: templates/authopenid/signin.html:40
+msgid "Click to sign in through any of these services."
 msgstr ""
+"<p><span class=\"big strong\">We accept <a href=\"http://openid.net"
+"\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new "
+"password - log in through any of the services below.<p><span class=\"big "
+"strong\">1. Select the login service by clicking one of the icons</span></p>"
 
-#: templates/authopenid/signin.html:28
-msgid "select openid provider"
-msgstr "1) Please select your id service provider."
+#: templates/authopenid/signin.html:103
+msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
+msgstr ""
+"<span class=\"big strong\">2. Enter your <span id=\"enter_your_what"
+"\">Provider user name</span></span><br>(or select another OpenID provider "
+"above)"
 
-#: templates/authopenid/signin.html:32
-msgid "verify openid link and login"
+#: templates/authopenid/signin.html:110
+msgid ""
+"Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
+"web address"
 msgstr ""
-"2) Please verify the OpenID URL (type your login name over {username}, if present)"
-" and then log in."
+"<span class=\"big strong\">2. Enter your <a class=\"openid_logo\" href="
+"\"http://openid.net\">OpenID</a> web address</span><br>(or choose specific "
+"provider by clicking on one of the icons above)"
 
-#: templates/authopenid/signin.html:57
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
+msgid "Login"
+msgstr ""
+
+#: templates/authopenid/signin.html:116
+msgid "we support two login modes"
+msgstr ""
+"You can log in either through one of these services or traditionally - using "
+"local username/password."
+
+#: templates/authopenid/signin.html:136
 msgid "Use login name and password"
 msgstr ""
 
-#: templates/authopenid/signin.html:58
+#: templates/authopenid/signin.html:137
 msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:62
-msgid "Create new acccount"
+#: templates/authopenid/signin.html:141
+msgid "Create new account"
 msgstr ""
 
-#: templates/authopenid/signin.html:71
+#: templates/authopenid/signin.html:150
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:75
+#: templates/authopenid/signin.html:154
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:78
+#: templates/authopenid/signin.html:157
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:81
+#: templates/authopenid/signin.html:160
 msgid "openid is widely adopted"
 msgstr ""
 "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
 "enabled."
 
-#: templates/authopenid/signin.html:84
+#: templates/authopenid/signin.html:163
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:88
+#: templates/authopenid/signin.html:167
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:89
+#: templates/authopenid/signin.html:168
 msgid "Get OpenID"
 msgstr ""
 
-#: templates/authopenid/signup.html:2 templates/authopenid/signup.html.py:6
+#: templates/authopenid/signup.html:4 templates/authopenid/signup.html.py:8
 msgid "Signup"
 msgstr ""
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid ""
 "We support two types of user registration: conventional username/password, "
 "and"
 msgstr ""
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid "the OpenID method"
 msgstr ""
 
-#: templates/authopenid/signup.html:15
+#: templates/authopenid/signup.html:17
 msgid "Sorry, looks like we have some errors"
 msgstr ""
 
-#: templates/authopenid/signup.html:33
+#: templates/authopenid/signup.html:35
 msgid "Conventional registration"
 msgstr ""
 
-#: templates/authopenid/signup.html:34
+#: templates/authopenid/signup.html:36
 msgid "choose a user name"
 msgstr ""
 
-#: templates/authopenid/signup.html:40
+#: templates/authopenid/signup.html:42
 msgid "back to login"
 msgstr ""
 
-#: templates/authopenid/signup.html:46
+#: templates/authopenid/signup.html:48
 msgid "Register with your OpenID"
 msgstr ""
 
-#
-#: templates/backup/answer_edit_tips.html:3
-#: templates/backup/question_edit_tips.html:2
-msgid "editing tips"
-msgstr "Tips"
-
-#: templates/backup/questions.html:108
-msgid "number of questions"
-msgstr ""
-
-#: templates/backup/questions.html:110
-msgid "tagged with"
-msgstr ""
-
-#: templates/backup/questions.html:116
-msgid "whose title contains"
-msgstr ""
-
-#: templates/backup/questions.html:121
-msgid "number of questions end of sentence."
-msgstr ""
-
-#: templates/backup/questions.html:123
-msgid "Questions are sorted by <strong>entry date</strong>."
-msgstr ""
-
-#: templates/backup/questions.html:123
-msgid "Newest questions shown first."
-msgstr ""
-"Questions are sorted by <strong>entry date</strong>.Newest questions shown "
-"first."
-
-#: templates/backup/unanswered.html:98 templates/tough/unanswered.html:95
-msgid "number of <strong>unanswered</strong> questions"
-msgstr ""
-
-#: templates/backup/user_info.html:44
-msgid "member since"
-msgstr ""
-
-#: templates/backup/user_stats.html:36
-#, python-format
-msgid "the answer has been voted for %(answered_question.vote_count)s times"
+#: templates/authopenid/signup.html:51
+msgid "Login with your OpenID"
 msgstr ""
 
-#: templates/tough/question_retag.html:2
-msgid "Revise tags"
-msgstr ""
+#~ msgid "what is this website"
+#~ msgstr ""
+#~ "This is a collaboratively edited question and answer site for the "
+#~ "Magnetic Resonance specialists."
 
-#: templates/tough/question_retag.html:37
-msgid "tags are requried"
-msgstr ""
-
-#: templates/tough/question_retag.html:38
-msgid "up to 5 tags, less than 20 characters each"
-msgstr ""
+#
+#~ msgid "editing tips"
+#~ msgstr "Tips"
 
-#: templates/tough/question_retag.html:51
-msgid "Change tags"
-msgstr ""
+#~ msgid "Newest questions shown first."
+#~ msgstr ""
+#~ "Questions are sorted by <strong>entry date</strong>.Newest questions "
+#~ "shown first."
 
-#: templates/tough/question_retag.html:74
-msgid "Change now"
-msgstr ""
+#~ msgid ""
+#~ "please use space to separate tags (this enables autocomplete feature)"
+#~ msgstr "please use space to separate tags (uses autocomplete utility)"
 
-#: templates/tough/question_retag.html:85
-msgid "Why use and modify tags?"
-msgstr ""
+#~ msgid "select openid provider"
+#~ msgstr "1) Please select your id service provider."
 
-#: templates/tough/question_retag.html:96
-msgid "tag editors receive special awards from the community"
-msgstr ""
+#~ msgid "verify openid link and login"
+#~ msgstr ""
+#~ "2) Please verify the OpenID URL (type your login name over {username}, if "
+#~ "present) and then log in."
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
deleted file mode 100644
index 7e934ecf..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 6801907c..a8ac642a 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-23 01:11-0300\n"
+"POT-Creation-Date: 2009-08-05 22:28-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,19 +15,21 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:27
+#: settings.py:12
 msgid "account/"
 msgstr "cuenta/"
 
-#: settings.py:27 django_authopenid/urls.py:9 django_authopenid/urls.py:11
+#: 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
 msgid "signin/"
 msgstr "ingresar/"
 
-#: django_authopenid/forms.py:67 django_authopenid/views.py:93
+#: django_authopenid/forms.py:67 django_authopenid/views.py:102
 msgid "i-names are not supported"
 msgstr "i-names no son soportados"
 
-#: django_authopenid/forms.py:102 django_authopenid/forms.py:207
+#: django_authopenid/forms.py:102
 msgid ""
 "Usernames can only contain                     letters, numbers and "
 "underscores"
@@ -42,7 +44,7 @@ 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
+#: django_authopenid/forms.py:126 django_authopenid/forms.py:233
 msgid ""
 "Please enter a valid                     username and password. Note that "
 "both fields are                     case-sensitive."
@@ -50,11 +52,11 @@ 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
+#: django_authopenid/forms.py:130 django_authopenid/forms.py:237
 msgid "This account is inactive."
 msgstr "Esta cuenta esta inactiva."
 
-#: django_authopenid/forms.py:158
+#: django_authopenid/forms.py:158 django_authopenid/forms.py:210
 msgid "invalid user name"
 msgstr "nombre de usuario no valido"
 
@@ -71,126 +73,136 @@ msgstr "nombre de usuario muy corto"
 msgid "this name is already in use - please try anoter"
 msgstr "este nombre ya está tomado - por favor intente con otro"
 
-#: django_authopenid/forms.py:184
+#: django_authopenid/forms.py:185
 msgid ""
-"This email is already                 registered in our database. Please "
-"choose another."
+"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
+#: django_authopenid/forms.py:216
 msgid ""
 "This username don't exist.                         Please choose another."
 msgstr "Este nombre de usuario no existe, por favor ingrese otro."
 
-#: django_authopenid/forms.py:253
+#: django_authopenid/forms.py:255
 msgid "choose a username"
 msgstr "elija un nombre de usuario"
 
-#: django_authopenid/forms.py:255 templates/authopenid/signup.html:36
+#: django_authopenid/forms.py:257 templates/authopenid/signup.html:38
 msgid "your email address"
 msgstr "su email (correo electrónico)"
 
-#: django_authopenid/forms.py:257 templates/authopenid/signup.html:37
+#: django_authopenid/forms.py:259 templates/authopenid/signup.html:39
 msgid "choose password"
 msgstr "elija una contraseña"
 
-#: django_authopenid/forms.py:259 templates/authopenid/signup.html:38
+#: django_authopenid/forms.py:261 templates/authopenid/signup.html:40
 msgid "retype password"
 msgstr "re-ingrese la contraseña"
 
-#: django_authopenid/forms.py:330
+#: django_authopenid/forms.py:335
 msgid ""
 "Old password is incorrect.                     Please enter the correct "
 "password."
 msgstr "La antigua contraseña es incorrecta. Por favor ingrese la correcta"
 
-#: django_authopenid/forms.py:342
+#: django_authopenid/forms.py:347
 msgid "new passwords do not match"
 msgstr "la nueva contraseña no coincide"
 
-#: django_authopenid/forms.py:434
+#: django_authopenid/forms.py:442
 msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
 #: django_authopenid/urls.py:10
+#, fuzzy
+msgid "newquestion/"
+msgstr "pregunta"
+
+#: django_authopenid/urls.py:11
+#, fuzzy
+msgid "newanswer/"
+msgstr "resputa"
+
+#: django_authopenid/urls.py:12
 msgid "signout/"
 msgstr "salir/"
 
-#: django_authopenid/urls.py:11
+#: django_authopenid/urls.py:13
 msgid "complete/"
 msgstr "completado/"
 
-#: django_authopenid/urls.py:13
+#: django_authopenid/urls.py:15
 msgid "register/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:14
+#: django_authopenid/urls.py:16
 msgid "signup/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:16
+#: django_authopenid/urls.py:18
 msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
-#: django_authopenid/urls.py:26
+#: django_authopenid/urls.py:29
 msgid "delete/"
 msgstr "borrar/"
 
-#: django_authopenid/views.py:99
+#: django_authopenid/views.py:108
 #, python-format
-msgid "非法OpenID地址： %s"
+msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:366
+#: django_authopenid/views.py:417 django_authopenid/views.py:544
 msgid "Welcome"
 msgstr "Bienvenido"
 
-#: django_authopenid/views.py:456
+#: django_authopenid/views.py:507
 msgid "Password changed."
 msgstr "Contraseña modificada"
 
-#: django_authopenid/views.py:488
-msgid "Email changed."
-msgstr "Email modificado."
+#: django_authopenid/views.py:519 django_authopenid/views.py:524
+msgid "your email needs to be validated"
+msgstr ""
 
-#: django_authopenid/views.py:519 django_authopenid/views.py:671
+#: django_authopenid/views.py:681 django_authopenid/views.py:833
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr "La OpenID %s no esta asociada en nuestra base de datos"
 
-#: django_authopenid/views.py:523 django_authopenid/views.py:678
+#: django_authopenid/views.py:685 django_authopenid/views.py:840
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr "La OpenID %s no esta asociada al usuario actualmente autenticado"
 
-#: django_authopenid/views.py:531
+#: django_authopenid/views.py:693
 msgid "Email Changed."
 msgstr "Email modificado"
 
-#: django_authopenid/views.py:606
+#: django_authopenid/views.py:768
 msgid "This OpenID is already associated with another account."
 msgstr "Esta OpenID ya está asociada a otra cuenta."
 
-#: django_authopenid/views.py:611
+#: django_authopenid/views.py:773
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr "La OpenID %s está ahora asociada con tu cuenta."
 
-#: django_authopenid/views.py:681
+#: django_authopenid/views.py:843
 msgid "Account deleted."
 msgstr "Cuenta borrada."
 
-#: django_authopenid/views.py:721
+#: django_authopenid/views.py:883
 msgid "Request for new password"
 msgstr "Pedir nueva contraseña"
 
-#: django_authopenid/views.py:734
+#: django_authopenid/views.py:896
 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:764
+#: django_authopenid/views.py:926
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
@@ -199,7 +211,7 @@ msgstr ""
 "No se ha podido modificar la contraseña. La clave de confirmación '%s' no "
 "está registrada"
 
-#: django_authopenid/views.py:773
+#: django_authopenid/views.py:935
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
@@ -207,7 +219,7 @@ msgstr ""
 "No se puede cambiar la contraseña. El usuario no existe más en nuestra base "
 "de datos."
 
-#: django_authopenid/views.py:782
+#: django_authopenid/views.py:944
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr "Contraseña cambiada por %s. Ahora puedes ingresar."
@@ -328,34 +340,21 @@ msgstr "versión inicial"
 msgid "retagged"
 msgstr "re-etiquetada"
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-#: templates/faq.html:25 templates/faq.html.py:108 templates/tough/faq.html:23
-#: templates/tough/faq.html.py:106 templates/tough/question_retag.html:89
-msgid "site title"
-msgstr "titulo del sitio"
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid " - "
 msgstr " - "
 
-#: forum/feed.py:17 templates/base.html:7 templates/base_content.html:6
-msgid "site slogan"
-msgstr " slogan del sitio"
-
-#: forum/feed.py:17
+#: forum/feed.py:18
 msgid "latest questions"
 msgstr "últimas preguntas"
 
-#: forum/feed.py:20 templates/index.html:8
-msgid "meta site content"
-msgstr "meta descripción"
-
-#: forum/feed.py:22
-msgid "copyright message"
-msgstr "mensaje de copyright"
+#: forum/feed.py:19
+#, fuzzy
+msgid "questions/"
+msgstr "preguntas"
 
 #: forum/forms.py:14 templates/answer_edit_tips.html:34
-#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html.py:38 templates/question_edit_tips.html:31
 #: templates/question_edit_tips.html:36
 msgid "title"
 msgstr "titulo"
@@ -380,25 +379,24 @@ msgstr "el contenido de la pregunta debe ser al menos de 10 caracteres"
 msgid "tags"
 msgstr "etiquetas"
 
-#: forum/forms.py:46
-msgid "please use space to separate tags (this enables autocomplete feature)"
+#: forum/forms.py:47
+msgid ""
+"Tags are short keywords, with no spaces within. Up to five tags can be used."
 msgstr ""
-"por favor utilice espacio para separar las etiquetas (esto habilitael auto-"
-"completado)"
 
-#: forum/forms.py:53
+#: forum/forms.py:54 templates/question_retag.html:38
 msgid "tags are required"
 msgstr "las etiquetas son requeridas"
 
-#: forum/forms.py:57
+#: forum/forms.py:58
 msgid "please use 5 tags or less"
 msgstr "por favor use 5 o menos etiquetas"
 
-#: forum/forms.py:60
+#: forum/forms.py:61
 msgid "tags must be shorter than 20 characters"
 msgstr "las etiquetas deben ser menores a 20 caracteres"
 
-#: forum/forms.py:64
+#: forum/forms.py:65
 msgid ""
 "please use following characters in tags: letters 'a-z', numbers, and "
 "characters '.-_#'"
@@ -406,15 +404,14 @@ 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/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:199
+#: templates/question.html.py:380 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
-#: templates/unanswered.html.py:60 templates/tough/unanswered.html:46
-#: templates/tough/unanswered.html.py:58
+#: templates/unanswered.html.py:60
 msgid "community wiki"
 msgstr "wiki de comunidad"
 
-#: forum/forms.py:75
+#: forum/forms.py:76
 msgid ""
 "if you choose community wiki option, the question and answer do not generate "
 "points and name of author will not be shown"
@@ -422,11 +419,11 @@ 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
+#: forum/forms.py:89
 msgid "update summary:"
 msgstr "resumen de modificación"
 
-#: forum/forms.py:85
+#: forum/forms.py:90
 msgid ""
 "enter a brief summary of your revision (e.g. fixed spelling, grammar, "
 "improved style, this field is optional)"
@@ -434,48 +431,72 @@ 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
+#: forum/forms.py:175
 msgid "this email does not have to be linked to gravatar"
 msgstr "este email no tiene porque estar asociado a un Gravatar"
 
-#: forum/forms.py:161
+#: forum/forms.py:176
 msgid "Real name"
 msgstr "Nombre real"
 
-#: forum/forms.py:162
+#: forum/forms.py:177
 msgid "Website"
 msgstr "Sitio Web"
 
-#: forum/forms.py:163
+#: forum/forms.py:178
 msgid "Location"
 msgstr "Ubicación"
 
-#: forum/forms.py:164
+#: forum/forms.py:179
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: forum/forms.py:164
+#: forum/forms.py:179
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD"
 
-#: forum/forms.py:165 templates/base.html:64
-#: templates/authopenid/settings.html:20
+#: forum/forms.py:180 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr "Perfil"
 
-#: forum/forms.py:190 forum/forms.py:191
+#: forum/forms.py:207 forum/forms.py:208
 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:316 templates/badges.html:51
+#: forum/models.py:238
+#, fuzzy, python-format
+msgid "%(author)s modified the question"
+msgstr "Cerrar la pregunta"
+
+#: forum/models.py:242
+#, python-format
+msgid "%(people)s posted %(new_answer_count)s new answers"
+msgstr ""
+
+#: forum/models.py:247
+#, fuzzy, python-format
+msgid "%(people)s commented the question"
+msgstr "pregunta comentada"
+
+#: forum/models.py:252
+#, fuzzy, python-format
+msgid "%(people)s commented answers"
+msgstr "respuesta comentada"
+
+#: forum/models.py:254
+#, fuzzy, python-format
+msgid "%(people)s commented the answer"
+msgstr "respuesta comentada"
+
+#: forum/models.py:433 templates/badges.html:52
 msgid "gold"
 msgstr "oro"
 
-#: forum/models.py:317 templates/badges.html:59
+#: forum/models.py:434 templates/badges.html:60
 msgid "silver"
 msgstr "plata"
 
-#: forum/models.py:318 templates/badges.html:66
+#: forum/models.py:435 templates/badges.html:67
 msgid "bronze"
 msgstr "bronze"
 
@@ -555,7 +576,7 @@ msgstr "perfil - votos"
 msgid "preferences"
 msgstr "preferencias"
 
-#: forum/user.py:69 templates/user_tabs.html:28
+#: forum/user.py:69 templates/user_tabs.html:27
 msgid "user preference settings"
 msgstr "preferencias del usuario"
 
@@ -563,28 +584,43 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:1730
+#: forum/views.py:304
+#, fuzzy
+msgid "/account/"
+msgstr "cuenta/"
+
+#: forum/views.py:943
+#, python-format
+msgid "subscription saved, %(email)s needs validation"
+msgstr ""
+
+#: forum/views.py:1853
 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:1732
+#: forum/views.py:1855
 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:1734
+#: forum/views.py:1857
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1736
+#: forum/views.py:1859
 #, 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/management/commands/send_email_alerts.py:35
+#, fuzzy
+msgid "updates from website"
+msgstr "sitio web del usuario"
+
 #: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168
 #: templates/header.html:33
 msgid "badges"
@@ -642,6 +678,10 @@ msgstr "ver todas las preguntas"
 msgid "see all tags"
 msgstr "ver todas las tags"
 
+#: templates/500.html:22
+msgid "sorry, system error"
+msgstr ""
+
 #: templates/500.html:24
 msgid "system error log is recorded, error will be fixed as soon as possible"
 msgstr ""
@@ -668,19 +708,19 @@ 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:37
-#: templates/question.html.py:40 templates/question_edit.html:27
+#: templates/ask.html:25 templates/ask.html.py:28 templates/question.html:40
+#: templates/question.html.py:43 templates/question_edit.html:27
 msgid "hide preview"
 msgstr "ocultar previsualización"
 
 #: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:40 templates/question_edit.html:27
+#: templates/question.html:43 templates/question_edit.html:27
 msgid "show preview"
 msgstr "ver previsualización"
 
 #: templates/answer_edit.html:47 templates/question_edit.html:65
-#: templates/revisions_answer.html:36 templates/revisions_question.html:36
-#: templates/tough/question_retag.html:51
+#: templates/question_retag.html:52 templates/revisions_answer.html:36
+#: templates/revisions_question.html:36
 msgid "back"
 msgstr "volver"
 
@@ -693,23 +733,25 @@ msgstr "revisión"
 msgid "select revision"
 msgstr "seleccionar revisión"
 
-#: templates/answer_edit.html:62 templates/ask.html:81
-#: templates/question.html:447 templates/question_edit.html:91
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 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:81
-#: templates/question.html:447 templates/question_edit.html:91
+#: templates/answer_edit.html:62 templates/ask.html:94
+#: templates/question.html:452 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
 msgid "Save edit"
 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 templates/tough/question_retag.html:75
+#: templates/question_edit.html:120 templates/question_retag.html:76
+#: templates/reopen.html:30 templates/user_edit.html:83
+#: templates/authopenid/changeemail.html:34
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -753,24 +795,24 @@ msgstr "**negrita** o __negrita__"
 msgid "link"
 msgstr "enlace"
 
-#: templates/answer_edit_tips.html:34 templates/answer_edit_tips.html.py:39
+#: 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
 msgid "text"
 msgstr "texto"
 
-#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:38 templates/question_edit_tips.html:36
 msgid "image"
 msgstr "imagen"
 
-#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:40
+#: templates/answer_edit_tips.html:42 templates/question_edit_tips.html:40
 msgid "numbered list:"
 msgstr "lista numerada"
 
-#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:45
+#: templates/answer_edit_tips.html:47 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
+#: templates/answer_edit_tips.html:50 templates/question_edit_tips.html:48
 msgid "learn more about Markdown"
 msgstr "aprender mas sobre Markdown"
 
@@ -778,32 +820,25 @@ msgstr "aprender mas sobre Markdown"
 msgid "Ask a question"
 msgstr "Hacer una pregunta"
 
-#: templates/ask.html:106
-msgid "Use"
-msgstr "Usar"
-
-#: templates/ask.html:106
-msgid "learn more about OpenID"
-msgstr "aprender mas sobre OpenID"
-
-#: templates/ask.html:106 templates/authopenid/signin.html:35
-#: templates/authopenid/signin.html:61
-msgid "Login"
-msgstr "Ingresar"
+#: templates/ask.html:67
+#, fuzzy
+msgid "login to post question info"
+msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/ask.html:109
-msgid "Get your own "
-msgstr "Obtiene tu propio "
+#: templates/ask.html:73
+#, python-format
+msgid "must have valid %(email)s to post"
+msgstr ""
 
-#: templates/ask.html:117 templates/authopenid/sendpw.html:27
-msgid "User name"
-msgstr "Nombre de usuario"
+#: templates/ask.html:108
+msgid "(required)"
+msgstr ""
 
-#: templates/ask.html:120
-msgid "Email: (won't be shown to anyone)"
-msgstr "Email: (no será mostrado a nadie)"
+#: templates/ask.html:115
+msgid "Login/signup to post your question"
+msgstr ""
 
-#: templates/ask.html:127
+#: templates/ask.html:117
 msgid "Ask your question"
 msgstr "Haz tu pregunta"
 
@@ -824,72 +859,47 @@ msgid "Badges"
 msgstr "Distinciones"
 
 #: templates/badges.html:21
+msgid "Community gives you awards for your questions, answers and votes."
+msgstr "La comunidad te da distinciones por tus preguntas, respuestas y votos."
+
+#: templates/badges.html:22
+#, fuzzy
 msgid ""
-"Community gives you awards for your questions, answers and votes. Below is "
-"the list of available badges and number of times each type of badge has been "
-"awarded."
+"Below is 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:48
+#: templates/badges.html:49
 msgid "Community badges"
 msgstr "Distinciones de la comunidad"
 
-#: templates/badges.html:54
-msgid ""
-"Gold badge is very rare. To obtain it you have to show profound knowledge "
-"and ability in addition to actively participating in the community. Gold "
-"badge is the highest award in this community."
+#: templates/badges.html:55
+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:62
-msgid ""
-"Obtaining silver badge requires significant patience. If you got one, you've "
-"very significantly contributed to this community"
+#: templates/badges.html:63
+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:65
+#: templates/badges.html:66
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 "distinción de bronce: con frecuencia entregada como reconocimiento especial."
 
-#: templates/badges.html:69
-msgid ""
-"If you are active in this community, you will get this medal - still it is a "
-"special honor."
+#: templates/badges.html:70
+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/base.html:62
-#, fuzzy
-msgid "Congratulations! You have new badges: "
-msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
-
-#: templates/base.html:63
-#, fuzzy
-msgid "go to see"
-msgstr "OK para cerrar"
-
-#: templates/base_content.html:61
-msgid "congratulations, community gave you a badge"
-msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
-
-#: templates/base_content.html:62
-msgid "see"
-msgstr "ver"
-
-#: templates/base_content.html:63
-msgid "profile"
-msgstr "perfil"
-
 #: templates/book.html:7
 msgid "reading channel"
 msgstr "canal de lectura"
@@ -956,9 +966,8 @@ msgstr "esta pregunta ha sido seleccionada como favorita"
 msgid "number of times"
 msgstr "numero de veces"
 
-#: templates/book.html:105 templates/index.html:47 templates/questions.html:46
+#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
 #: templates/unanswered.html:37 templates/users_questions.html:30
-#: templates/tough/unanswered.html:35
 msgid "votes"
 msgstr "votos"
 
@@ -966,18 +975,16 @@ msgstr "votos"
 msgid "the answer has been accepted to be correct"
 msgstr "la respuesta ha sido aceptada como correcta"
 
-#: templates/book.html:115 templates/index.html:48 templates/questions.html:47
+#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
 #: templates/unanswered.html:38 templates/users_questions.html:40
-#: templates/tough/unanswered.html:36
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: 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/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "using tags"
 msgstr "usando etiquetas"
 
@@ -1005,15 +1012,15 @@ msgstr "Razón"
 msgid "OK to close"
 msgstr "OK para cerrar"
 
-#: templates/faq.html:11 templates/tough/faq.html:9
+#: templates/faq.html:11
 msgid "Frequently Asked Questions "
 msgstr "Preguntas Frecuentes"
 
-#: templates/faq.html:15 templates/tough/faq.html:13
+#: templates/faq.html:16
 msgid "What kinds of questions can I ask here?"
 msgstr "¿Qué clase de preguntas puedo hacer aquí?"
 
-#: templates/faq.html:16 templates/tough/faq.html:14
+#: templates/faq.html:17
 msgid ""
 "Most importanly - questions should be <strong>relevant</strong> to this "
 "community."
@@ -1021,7 +1028,7 @@ msgstr ""
 "Por encima de todo - las preguntas deben ser <strong>relevantes</strong>a "
 "esta comunidad."
 
-#: templates/faq.html:17 templates/tough/faq.html:15
+#: templates/faq.html:18
 msgid ""
 "Before asking the question - please make sure to use search to see whether "
 "your question has alredy been answered."
@@ -1029,11 +1036,11 @@ msgstr ""
 "Antes de hacer tu pregunta - por favor usa el buscador para asegurarte que "
 "la pregunta no este ya hecha."
 
-#: templates/faq.html:20 templates/tough/faq.html:18
+#: templates/faq.html:21
 msgid "What questions should I avoid asking?"
 msgstr "¿Qué preguntas debería evitar preguntar?"
 
-#: templates/faq.html:21 templates/tough/faq.html:19
+#: templates/faq.html:22
 msgid ""
 "Please avoid asking questions that are not relevant to this community, too "
 "subjective and argumentative."
@@ -1041,11 +1048,15 @@ msgstr ""
 "Evita hacer preguntas que no son relevantes a la comunidad, demasiado "
 "subjetivas o argumentativas."
 
-#: templates/faq.html:24 templates/tough/faq.html:22
+#: templates/faq.html:27
 msgid "What should I avoid in my answers?"
 msgstr "¿Que debo evitar en mis respuestas?"
 
-#: templates/faq.html:25 templates/tough/faq.html:23
+#: templates/faq.html:28 templates/faq.html.py:132
+msgid "site title"
+msgstr "titulo del sitio"
+
+#: templates/faq.html:28
 msgid ""
 "is a Q&A site, not a discussion group. Therefore - please avoid having "
 "discussions in your answers, comment facility allows some space for brief "
@@ -1055,19 +1066,19 @@ msgstr ""
 "intenta evitar discusiones en tus respuestas. Los comentarios permiten "
 "realizar pequeñas discusiones."
 
-#: templates/faq.html:28 templates/tough/faq.html:26
+#: templates/faq.html:32
 msgid "Who moderates this community?"
 msgstr "¿Quién modera esta comunidad?"
 
-#: templates/faq.html:29 templates/tough/faq.html:27
+#: templates/faq.html:33
 msgid "The short answer is: <strong>you</strong>."
 msgstr "La respuesta corta es: <strong>tú</strong>"
 
-#: templates/faq.html:30 templates/tough/faq.html:28
+#: templates/faq.html:34
 msgid "This website is moderated by the users."
 msgstr "Este sitio es moderado por los usuarios."
 
-#: templates/faq.html:31 templates/tough/faq.html:29
+#: templates/faq.html:35
 msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
@@ -1075,120 +1086,83 @@ msgstr ""
 "El sistema de reputación permite a los usuarios adquirir autorización para "
 "realizar diversas tareas de moderación."
 
-#: templates/faq.html:34 templates/tough/faq.html:32
+#: templates/faq.html:40
 msgid "How does reputation system work?"
 msgstr "¿Cómo funciona el sistema de reputación?"
 
-#: templates/faq.html:35 templates/tough/faq.html:33
-msgid ""
-"Anyone can ask questions and give answers, points are not necessary for that."
-msgstr ""
-"Cualquier usuario puede hacer preguntas y dar respuestas, no es necesario "
-"tener reputación para ello."
-
-#: templates/faq.html:36 templates/tough/faq.html:34
-msgid ""
-"As we've said before, users help running this site. Point system helps "
-"select users who can administer this community."
-msgstr ""
-"Como dijimos antes, los usuarios ayudan a crear este sitio. El sistema de "
-"reputación permite seleccionar usuarios que pueden moderar esta comunidad."
-
-#: templates/faq.html:37 templates/tough/faq.html:35
-msgid ""
-"Reputation points roughly measure how community trusts you. These points are "
-"given to you directly by other members of the community."
-msgstr ""
-"Los puntos de reputación miden a groso modo que tan respetado eres en la "
-"comunidad. Los puntos son dados a ti directamente por otros miembros de la "
-"comunidad"
-
-#: templates/faq.html:40 templates/tough/faq.html:38
-msgid ""
-"For example, if you ask an interesting question or give a helpful answer, "
-"your input will be upvoted and you will gain more trust in the community."
-msgstr ""
-"Por ejemplo, si haces una pregunta interesante, o das una respuesta valiosa, "
-"tu entrada va a ser votada positivamente y tu ganarás confianza en la "
-"comunidad."
-
-#: templates/faq.html:41 templates/tough/faq.html:39
-msgid ""
-"If on the other hand someone gives a misleading answer, the answer will be "
-"voted down and he/she loses some points."
-msgstr ""
-"Si por el contrario, alguien da una respuesta que no corresponde, la "
-"respuesta será votada negativamente y el usuario perderá puntos."
-
-#: templates/faq.html:42 templates/tough/faq.html:40
-msgid ""
-"Each vote in favor will generate <strong>10</strong> points, each vote "
-"against will subtract <strong>2</strong> points."
-msgstr ""
-"Cada voto a favor generará <strong>10</strong> puntos, cada voto negativo "
-"restará <strong>2</strong> puntos."
-
-#: templates/faq.html:43 templates/tough/faq.html:41
-msgid ""
-"Through the votes of other people you can accumulate a maximum of "
-"<strong>200</strong> points."
-msgstr ""
-"A través del voto de otras personas puedes acumular un máximo de "
-"<strong>200</strong> puntos."
-
-#: templates/faq.html:44
-msgid "After accumulating certain number of points, you can do more:"
-msgstr "Luego de haber acumulado cierta cantidad de puntos, puedes hacer más:"
+#: templates/faq.html:41
+#, fuzzy
+msgid "Rep system summary"
+msgstr "resumen de modificación"
 
-#: templates/faq.html:52 templates/user_votes.html:14
-#: templates/tough/faq.html:50
+#: templates/faq.html:59 templates/user_votes.html:14
 msgid "upvote"
 msgstr "votar positivo"
 
-#: templates/faq.html:56 templates/tough/faq.html:54
+#: templates/faq.html:63
 msgid "use tags"
 msgstr "etiquetas usadas"
 
-#: templates/faq.html:60 templates/tough/faq.html:58
+#: templates/faq.html:68
 msgid "add comments"
 msgstr "agregar comentarios"
 
-#: templates/faq.html:64 templates/user_votes.html:16
-#: templates/tough/faq.html:62
+#: templates/faq.html:72 templates/user_votes.html:16
 msgid "downvote"
 msgstr "votar negativo"
 
-#: templates/faq.html:71 templates/tough/faq.html:69
+#: templates/faq.html:75
+#, fuzzy
+msgid "open and close own questions"
+msgstr "abrir cualquier pregunta cerrada"
+
+#: templates/faq.html:79
 msgid "retag questions"
 msgstr "re-etiquetar preguntas"
 
-#: templates/faq.html:75 templates/tough/faq.html:73
+#: templates/faq.html:83
 msgid "edit community wiki questions"
 msgstr "editar preguntas de la wiki comunitaria"
 
-#: templates/faq.html:79 templates/tough/faq.html:77
+#: templates/faq.html:87
 msgid "edit any answer"
 msgstr "editar cualquier pregunta"
 
-#: templates/faq.html:83 templates/tough/faq.html:81
+#: templates/faq.html:91
 msgid "open any closed question"
 msgstr "abrir cualquier pregunta cerrada"
 
-#: templates/faq.html:87 templates/tough/faq.html:85
+#: templates/faq.html:95
 msgid "delete any comment"
 msgstr "borrar cualquier comentario"
 
-#: templates/faq.html:91 templates/tough/faq.html:89
+#: templates/faq.html:99
 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:98
+#: templates/faq.html:106
+msgid "how to validate email title"
+msgstr ""
+
+#: templates/faq.html:108
+msgid "how to validate email info"
+msgstr ""
+
+#: templates/faq.html:112
+msgid "what is gravatar"
+msgstr ""
+
+#: templates/faq.html:113
+msgid "gravatar faq info"
+msgstr ""
+
+#: templates/faq.html:116
 msgid "To register, do I need to create new password?"
 msgstr "¿Para registrarme, debo crearme una cuenta?"
 
-#: templates/faq.html:99 templates/tough/faq.html:97
+#: templates/faq.html:117
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
@@ -1196,19 +1170,19 @@ msgstr ""
 "No tienes porqué. Puedes ingresar usando cualquiera de los servicios que "
 "soportan OpenID, ej. Google, Yahoo, AOL, MyOpenID, etc."
 
-#: templates/faq.html:100 templates/tough/faq.html:98
+#: templates/faq.html:118
 msgid "Login now!"
 msgstr "Ingresa ahora!"
 
-#: templates/faq.html:103 templates/tough/faq.html:101
+#: templates/faq.html:123
 msgid "Why other people can edit my questions/answers?"
 msgstr "¿Porqué otras personas pueden editar mis preguntas y respuestas?"
 
-#: templates/faq.html:104 templates/tough/faq.html:102
+#: templates/faq.html:124
 msgid "Goal of this site is..."
 msgstr "El objetivo de este sitio es..."
 
-#: templates/faq.html:104 templates/tough/faq.html:102
+#: templates/faq.html:124
 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 "
@@ -1218,34 +1192,32 @@ msgstr ""
 "usuarios con experiencia, y esto mejora la calidad general del conocimiento "
 "guardado."
 
-#: templates/faq.html:105 templates/tough/faq.html:103
+#: templates/faq.html:125
 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:107 templates/tough/faq.html:105
+#: templates/faq.html:129
 msgid "Still have questions?"
 msgstr "¿Aún tienes preguntas?"
 
-#: templates/faq.html:108
+#: templates/faq.html:130
 msgid "Please ask your question, help make our community better!"
 msgstr "Por favor haz tu pregunta, ¡ayudanos a mejorar nuestra comunidad!"
 
-#: templates/faq.html:108 templates/header.html:29 templates/header.html.py:60
-#: templates/tough/faq.html:106
+#: templates/faq.html:132 templates/header.html:29 templates/header.html.py:60
 msgid "questions"
 msgstr "preguntas"
 
-#: templates/faq.html:108 templates/index.html:121
-#: templates/tough/faq.html:106
+#: templates/faq.html:132 templates/index.html:121
 msgid "."
 msgstr ""
 
-#: templates/footer.html:7 templates/header.html:12 templates/index.html:83
+#: templates/footer.html:7 templates/header.html:14 templates/index.html:83
 msgid "about"
 msgstr "acerca de"
 
-#: templates/footer.html:8 templates/header.html:13 templates/index.html:84
+#: templates/footer.html:8 templates/header.html:15 templates/index.html:84
 msgid "faq"
 msgstr "preguntas frecuentes"
 
@@ -1269,11 +1241,11 @@ msgstr "envía comentarios"
 msgid "current revision"
 msgstr "revisión actual"
 
-#: templates/header.html:8
+#: templates/header.html:10
 msgid "logout"
 msgstr "salir"
 
-#: templates/header.html:10 templates/authopenid/signup.html:39
+#: templates/header.html:12 templates/authopenid/signup.html:41
 msgid "login"
 msgstr "entrar"
 
@@ -1289,7 +1261,7 @@ msgstr "usuarios"
 msgid "books"
 msgstr "libros"
 
-#: templates/header.html:34 templates/index.html:121
+#: templates/header.html:34
 msgid "unanswered questions"
 msgstr "sin respuesta"
 
@@ -1305,74 +1277,60 @@ msgstr "hacer una pregunta"
 msgid "search"
 msgstr "buscar"
 
-#: templates/index.html:6
+#: templates/index.html:7
 msgid "Home"
 msgstr "Inicio"
 
-#: templates/index.html:7
-msgid "meta site keywords, comma separated"
-msgstr "palabras claves"
-
-#: templates/index.html:21 templates/questions.html:7
+#: templates/index.html:22 templates/questions.html:7
 msgid "Questions"
 msgstr "Preguntas"
 
-#: templates/index.html:23
+#: templates/index.html:24
 msgid "last updated questions"
 msgstr "ultimas preguntas actualizadas"
 
-#: templates/index.html:23 templates/questions.html:25
-#: templates/unanswered.html:20 templates/tough/unanswered.html:18
+#: templates/index.html:24 templates/questions.html:25
+#: templates/unanswered.html:20
 msgid "newest"
 msgstr "más nuevas"
 
-#: templates/index.html:24 templates/questions.html:27
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest questions"
 msgstr "preguntas más calientes"
 
-#: templates/index.html:24 templates/questions.html:27
+#: templates/index.html:25 templates/questions.html:27
 msgid "hottest"
 msgstr "más calientes"
 
-#: templates/index.html:25 templates/questions.html:28
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted questions"
 msgstr "preguntas más votadas"
 
-#: templates/index.html:25 templates/questions.html:28
+#: templates/index.html:26 templates/questions.html:28
 msgid "most voted"
 msgstr "más votadas"
 
-#: templates/index.html:26
+#: templates/index.html:27
 msgid "all questions"
 msgstr "todas las preguntas"
 
-#: templates/index.html:46 templates/questions.html:45
+#: templates/index.html:47 templates/questions.html:45
 #: templates/unanswered.html:36 templates/users_questions.html:35
-#: templates/tough/unanswered.html:34
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:68 templates/question.html:112
-#: templates/question.html.py:479 templates/questions.html:84
-#: templates/questions.html.py:149 templates/tags.html:47
+#: 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/tough/unanswered.html:72
-#: templates/tough/unanswered.html:105
+#: templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
-#: templates/index.html:79
+#: templates/index.html:80
 msgid "welcome to website"
 msgstr "bienvenido a sitio"
 
-#: templates/index.html:81
-msgid "what is this website"
-msgstr "que es este sitio"
-
-#: templates/index.html:82
-msgid "what can one do on this website"
-msgstr "que puede uno hacer en este sitio"
-
 #: templates/index.html:89
 msgid "Recent tags"
 msgstr "Etiquetas recientes"
@@ -1407,7 +1365,8 @@ msgid "Still looking for more? See"
 msgstr "¿Aún sigues buscando más? Ver"
 
 #: templates/index.html:121
-msgid "complete list of quesionts"
+#, fuzzy
+msgid "complete list of questions"
 msgstr "lista completa de preguntas"
 
 #: templates/index.html:121
@@ -1418,6 +1377,11 @@ msgstr "ó"
 msgid "Please help us answer"
 msgstr "Ayudanos a responder"
 
+#: templates/index.html:121
+#, fuzzy
+msgid "list of unanswered questions"
+msgstr "sin respuesta"
+
 #: templates/logout.html:6 templates/logout.html.py:17
 msgid "Logout"
 msgstr "Salir"
@@ -1442,19 +1406,19 @@ msgstr "entradas por página"
 msgid "previous"
 msgstr "previo"
 
-#: templates/paginator.html:20
+#: templates/paginator.html:19
 msgid "current page"
 msgstr "página actúal"
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "page number "
 msgstr "número de página"
 
-#: templates/paginator.html:23 templates/paginator.html.py:30
+#: templates/paginator.html:22 templates/paginator.html.py:29
 msgid "number - make blank in english"
 msgstr " "
 
-#: templates/paginator.html:34
+#: templates/paginator.html:33
 msgid "next page"
 msgstr "próxima página"
 
@@ -1502,75 +1466,75 @@ 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:66 templates/question.html.py:78
+#: templates/question.html:69 templates/question.html.py:81
 msgid "i like this post (click again to cancel)"
 msgstr "Me gusta esta entrada (clickear devuelta para cancelar)"
 
-#: templates/question.html:68 templates/question.html.py:80
-#: templates/question.html:273
+#: templates/question.html:71 templates/question.html.py:83
+#: templates/question.html:276
 msgid "current number of votes"
 msgstr "número actual de votos"
 
-#: templates/question.html:73 templates/question.html.py:84
+#: templates/question.html:76 templates/question.html.py:87
 msgid "i dont like this post (click again to cancel)"
 msgstr "No me gusta esta entrada (clickear devuelta para cancelar)"
 
-#: templates/question.html:90
+#: templates/question.html:93
 msgid "mark this question as favorite (click again to cancel)"
 msgstr "marcar esta pregunta como favorita (clickear devuelta para cancelar)"
 
-#: templates/question.html:96
+#: templates/question.html:99
 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/question.html:124 templates/question.html.py:307
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
 msgstr "editar"
 
-#: templates/question.html:125 templates/question.html.py:314
+#: templates/question.html:128 templates/question.html.py:317
 msgid "delete"
 msgstr "borrar"
 
-#: templates/question.html:130
+#: templates/question.html:133
 msgid "reopen"
 msgstr "re-abrir"
 
-#: templates/question.html:135
+#: templates/question.html:138
 msgid "close"
 msgstr "cerrar"
 
-#: templates/question.html:141 templates/question.html.py:327
+#: templates/question.html:144 templates/question.html.py:330
 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
+#: templates/question.html:145 templates/question.html.py:331
 msgid "flag offensive"
 msgstr "marcar como ofensivo"
 
-#: templates/question.html:154 templates/question.html.py:337
+#: templates/question.html:157 templates/question.html.py:340
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
 msgstr "actualizado"
 
-#: templates/question.html:203 templates/question.html.py:384
+#: templates/question.html:206 templates/question.html.py:387
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
 msgstr "preguntado"
 
-#: templates/question.html:233 templates/question.html.py:411
+#: templates/question.html:236 templates/question.html.py:414
 msgid "comments"
 msgstr "comentarios"
 
-#: templates/question.html:234 templates/question.html.py:412
+#: templates/question.html:237 templates/question.html.py:415
 msgid "add comment"
 msgstr "agregar comentario"
 
-#: templates/question.html:247
+#: templates/question.html:250
 #, python-format
 msgid ""
 "The question has been closed for the following reason \"%(question."
@@ -1579,105 +1543,113 @@ msgstr ""
 "La pregunta ha sido cerrada por el siguiente motivo \"%(question."
 "get_close_reason_display)s\" por"
 
-#: templates/question.html:249
+#: templates/question.html:252
 #, python-format
 msgid "close date %(question.closed_at)s"
 msgstr "fecha de cerrada %(question.closed_at)s"
 
-#: templates/question.html:256 templates/user_stats.html:28
+#: templates/question.html:259 templates/user_stats.html:28
 msgid "Answers"
 msgstr "Respuestas"
 
-#: templates/question.html:258
+#: templates/question.html:261
 msgid "oldest answers will be shown first"
 msgstr "la respuesta mas vieja será mostrada primero"
 
-#: templates/question.html:258
+#: templates/question.html:261
 msgid "oldest answers"
 msgstr "pregunta más vieja"
 
-#: templates/question.html:259
+#: templates/question.html:262
 msgid "newest answers will be shown first"
 msgstr "preguntas más nuevas serán mostradas primero"
 
-#: templates/question.html:259
+#: templates/question.html:262
 msgid "newest answers"
 msgstr "más nuevas"
 
-#: templates/question.html:260
+#: templates/question.html:263
 msgid "most voted answers will be shown first"
 msgstr "las preguntas más votadas serán mostradas primero"
 
-#: templates/question.html:260
+#: templates/question.html:263
 msgid "popular answers"
 msgstr "respuestas populares serán mostradas primero"
 
-#: templates/question.html:272
+#: templates/question.html:275
 msgid "i like this answer (click again to cancel)"
 msgstr "me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:278
+#: templates/question.html:281
 msgid "i dont like this answer (click again to cancel)"
 msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:284
+#: templates/question.html:287
 msgid "mark this answer as favorite (click again to undo)"
 msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)"
 
-#: templates/question.html:289
+#: templates/question.html:292
 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:311
+#: templates/question.html:314
 msgid "undelete"
 msgstr "deshacer eliminar"
 
-#: templates/question.html:321
+#: templates/question.html:324
 msgid "answer permanent link"
 msgstr "enlace permanente a respuesta"
 
-#: templates/question.html:322
+#: templates/question.html:325
 msgid "permanent link"
 msgstr "enlace permanente"
 
-#: templates/question.html:436
+#: templates/question.html:438
 msgid "Your answer"
 msgstr "Tu respuesta"
 
-#: templates/question.html:460
+#: templates/question.html:441
+msgid "you can answer anonymously and then login"
+msgstr ""
+
+#: templates/question.html:465
 msgid "Answer the question"
 msgstr "Responde la pregunta"
 
-#: templates/question.html:462
-msgid "Login to answer"
-msgstr "Ingresa para responder"
+#: templates/question.html:467
+msgid "Notify me daily if there are any new answers."
+msgstr ""
+
+#: templates/question.html:469
+msgid "once you sign in you will be able to subscribe for any updates here"
+msgstr ""
 
-#: templates/question.html:474
+#: templates/question.html:481
 msgid "Question tags"
 msgstr "Etiquetas de la pregunta"
 
-#: templates/question.html:484
+#: templates/question.html:491
 msgid "question asked"
 msgstr "pregunta preguntada"
 
-#: templates/question.html:484 templates/question.html.py:490
+#: templates/question.html:491 templates/question.html.py:497
 #: templates/user_info.html:51
 msgid "ago"
 msgstr "atrás"
 
-#: templates/question.html:487
+#: templates/question.html:494
 msgid "question was seen"
 msgstr "la pregunta fue vista"
 
-#: templates/question.html:487
+#: templates/question.html:494
 msgid "times"
 msgstr "veces"
 
-#: templates/question.html:490
+#: templates/question.html:497
 msgid "last updated"
 msgstr "última vez actualizada"
 
-#: templates/question.html:495
+#: templates/question.html:502
 msgid "Related questions"
 msgstr "Preguntas relacionadas"
 
@@ -1697,6 +1669,27 @@ msgstr "por favor hacer preguntas relevantes"
 msgid "please try provide enough details"
 msgstr "intente proveer suficientes detalles"
 
+#: templates/question_retag.html:3 templates/question_retag.html.py:52
+msgid "Change tags"
+msgstr "Cambiar etiquetas"
+
+#: templates/question_retag.html:39
+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
+msgid "Why use and modify tags?"
+msgstr "¿Porqué usar y modificar etiquetas?"
+
+#: templates/question_retag.html:89
+msgid "tags help us keep Questions organized"
+msgstr ""
+
+#: templates/question_retag.html:95
+msgid "tag editors receive special awards from the community"
+msgstr ""
+"los editores de etiquetas reciben distinciones especiales de la comunidad"
+
 #: templates/questions.html:23
 msgid "Found by tags"
 msgstr "Encontradas por etiqueta"
@@ -1710,7 +1703,6 @@ msgid "All questions"
 msgstr "Todas las preguntas"
 
 #: templates/questions.html:25 templates/unanswered.html:20
-#: templates/tough/unanswered.html:18
 msgid "most recently asked questions"
 msgstr "preguntas hechas más recientemente"
 
@@ -1726,7 +1718,7 @@ msgstr "actividad"
 #, fuzzy, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s question tagged %(tagname)s\n"
+"\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
 "\t\t\t"
 msgid_plural ""
 "\n"
@@ -1736,15 +1728,15 @@ msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
 msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
 
 #: templates/questions.html:116
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s question containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgid_plural ""
 "\n"
-"\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t"
+"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
+"\t\t\t\t"
 msgstr[0] ""
 "\n"
 "\t\t\thay un total de %(q_num)s preguntas que contienen %(searchtitle)s\n"
@@ -1754,37 +1746,49 @@ msgstr[1] ""
 "\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n"
 "\t\t\t"
 
-#: templates/questions.html:124
+#: templates/questions.html:122
+#, fuzzy, python-format
+msgid ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgid_plural ""
+"\n"
+"\t\t\t\thave total %(q_num)s questions\n"
+"\t\t\t\t"
+msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
+msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
+
+#: templates/questions.html:131
 msgid "latest questions info"
 msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/questions.html:128
+#: templates/questions.html:135
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 "Las preguntas estan ordenadas por <strong>fecha de último update</strong>."
 
-#: templates/questions.html:129
+#: templates/questions.html:136
 msgid "Most recently answered ones are shown first."
 msgstr "Las más recientemente respondidas son mostradas primero."
 
-#: templates/questions.html:133
+#: templates/questions.html:140
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Preguntas ordenadas por <strong>número de respuestas</strong>."
 
-#: templates/questions.html:134
+#: templates/questions.html:141
 msgid "Most answered questions are shown first."
 msgstr "Preguntas más respondidas aparecen primero."
 
-#: templates/questions.html:138
+#: templates/questions.html:145
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>."
 
-#: templates/questions.html:139
+#: templates/questions.html:146
 msgid "Most voted questions are shown first."
 msgstr "Las preguntas más votadas son mostradas primero."
 
-#: templates/questions.html:146 templates/unanswered.html:105
-#: templates/tough/unanswered.html:101
+#: templates/questions.html:153 templates/unanswered.html:105
 msgid "Related tags"
 msgstr "Etiquetas relacionadas"
 
@@ -1854,7 +1858,6 @@ msgid "Nothing found"
 msgstr "Nada encontrado"
 
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
-#: templates/tough/unanswered.html:5 templates/tough/unanswered.html.py:16
 msgid "Unanswered questions"
 msgstr "Preguntas sin respuesta"
 
@@ -1925,14 +1928,41 @@ msgstr "edad"
 msgid "age unit"
 msgstr "unidad de edad"
 
-#: templates/user_info.html:75
+#: templates/user_info.html:76
 msgid "todays unused votes"
 msgstr "votos de hoy no usados"
 
-#: templates/user_info.html:76
+#: templates/user_info.html:77
 msgid "votes left"
 msgstr "votos restantes"
 
+#: templates/user_preferences.html:10
+msgid "Connect with Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:12
+#, fuzzy
+msgid "Twitter account name:"
+msgstr "Esta cuenta esta inactiva."
+
+#: templates/user_preferences.html:14
+#, fuzzy
+msgid "Twitter password:"
+msgstr "Nueva contraseña"
+
+#: templates/user_preferences.html:16
+msgid "Send my Questions to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:17
+msgid "Send my Answers to Twitter"
+msgstr ""
+
+#: templates/user_preferences.html:18
+#, fuzzy
+msgid "Save"
+msgstr "Guardar la edición"
+
 #: templates/user_stats.html:15
 msgid "User questions"
 msgstr "Preguntas del usuario"
@@ -1989,7 +2019,7 @@ msgstr "historial de reputación"
 msgid "favorites"
 msgstr "favoritos"
 
-#: templates/user_tabs.html:29
+#: templates/user_tabs.html:28
 msgid "settings"
 msgstr "preferencias"
 
@@ -2026,118 +2056,152 @@ msgstr "esta pregunta ha sido seleccionada como favorita"
 msgid "this answer has been accepted to be correct"
 msgstr "esta respuesta ha sido aceptada como correcta"
 
-#: templates/authopenid/changeemail.html:6
-msgid "Account: change email"
-msgstr "Cuenta: cambiar el email"
+#: templates/authopenid/changeemail.html:7
+#: templates/authopenid/changeemail.html:33
+msgid "Change email"
+msgstr "Cambiar dirección email"
 
-#: templates/authopenid/changeemail.html:9
-msgid ""
-"This is where you can change the email address associated with your account. "
-"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
+#: templates/authopenid/changeemail.html:10
+#, fuzzy, python-format
+msgid "change %(email)s info"
+msgstr "Cambiar email "
+
+#: templates/authopenid/changeemail.html:13
+#: templates/authopenid/changeopenid.html:14
+#: templates/authopenid/changepw.html:19 templates/authopenid/delete.html:15
+#: templates/authopenid/delete.html:25
 msgid "Please correct errors below:"
 msgstr "Por favor corrija los errores debajo: "
 
-#: templates/authopenid/changeemail.html:28
-msgid "Email"
-msgstr "Email"
+#: templates/authopenid/changeemail.html:30
+msgid "Your new Email"
+msgstr ""
 
-#: templates/authopenid/changeemail.html:29
-#: templates/authopenid/signin.html:60
+#: templates/authopenid/changeemail.html:31
+#: templates/authopenid/signin.html:138
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/authopenid/changeemail.html:31
-msgid "Change email"
+#: templates/authopenid/changeemail.html:42
+#, fuzzy
+msgid "Validate email"
 msgstr "Cambiar dirección email"
 
-#: templates/authopenid/changeopenid.html:7
+#: templates/authopenid/changeemail.html:45
+#, python-format
+msgid "validate %(email)s info"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:50
+#, fuzzy
+msgid "Email not changed"
+msgstr "Email modificado."
+
+#: templates/authopenid/changeemail.html:53
+#, python-format
+msgid "old %(email)s kept"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:58
+#, fuzzy
+msgid "Email changed"
+msgstr "Email modificado."
+
+#: templates/authopenid/changeemail.html:61
+#, python-format
+msgid "your current %(email)s can be used for this"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:66
+msgid "Email verified"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:69
+msgid "thanks for verifying email"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:74
+msgid "email key not sent"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:77
+#, python-format
+msgid "email key not sent %(email)s change email here %(change_link)s"
+msgstr ""
+
+#: templates/authopenid/changeopenid.html:8
 msgid "Account: change OpenID URL"
 msgstr "Cuenta: cambiar la URL de OpenID"
 
-#: templates/authopenid/changeopenid.html:11
+#: templates/authopenid/changeopenid.html:12
 msgid ""
 "This is where you can change your OpenID URL. Make sure you remember it!"
 msgstr "Aquí es donde puedes cambiar tu OpenID URL. Asegurate de recordarla!"
 
-#: templates/authopenid/changeopenid.html:28
+#: templates/authopenid/changeopenid.html:29
 msgid "OpenID URL:"
 msgstr "URL de OpenID:"
 
-#: templates/authopenid/changeopenid.html:29
+#: templates/authopenid/changeopenid.html:30
 msgid "Change OpenID"
 msgstr "Cambiar OpenID"
 
-#: templates/authopenid/changepw.html:13
+#: templates/authopenid/changepw.html:14
 msgid "Account: change password"
 msgstr "Cuenta: cambiar contraseña"
 
-#: templates/authopenid/changepw.html:16
+#: templates/authopenid/changepw.html:17
 msgid "This is where you can change your password. Make sure you remember it!"
 msgstr "Aquí es donde puedes cambiar tu contraseña. Asegurate de recordarlo!"
 
-#: templates/authopenid/changepw.html:26
+#: templates/authopenid/changepw.html:27
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/authopenid/changepw.html:27
+#: templates/authopenid/changepw.html:28
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: templates/authopenid/changepw.html:28
+#: templates/authopenid/changepw.html:29
 msgid "New password again"
 msgstr "Nueva contraseña nuevamente"
 
-#: templates/authopenid/changepw.html:29 templates/authopenid/settings.html:28
+#: templates/authopenid/changepw.html:30 templates/authopenid/settings.html:29
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/authopenid/complete.html:4
+#: templates/authopenid/complete.html:5
 msgid "Connect your OpenID with this site"
 msgstr "Vincular tu OpenID con este sitio"
 
-#: templates/authopenid/complete.html:7
+#: templates/authopenid/complete.html:8
 msgid "Connect your OpenID with your account on this site"
 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."
+#: templates/authopenid/complete.html:12
+#, python-format
+msgid "register new %(provider)s account info"
 msgstr ""
-"Tu OpenID es aceptada. Por favor completa lo siguiente para finalizar el "
-"registro."
 
-#: templates/authopenid/complete.html:11
+#: templates/authopenid/complete.html:14
 msgid "This account already exists, please use another."
 msgstr "Esta cuenta ya existe, por favor usar otra."
 
-#: templates/authopenid/complete.html:16 templates/authopenid/complete.html:29
-#: templates/authopenid/signin.html:43
+#: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
+#: templates/authopenid/signin.html:121
 msgid "Sorry, looks like we have some errors:"
 msgstr "Ups, parece que hay errores:"
 
-#: templates/authopenid/complete.html:45
-msgid "New account"
-msgstr "Nueva cuenta"
-
-#: templates/authopenid/complete.html:46
-msgid "User name (<i>will be shown to others, cannot be modified</i>)"
-msgstr ""
-"Nombre de usuario (<i>será mostrado a otros, no puede ser modificado</i>)"
-
 #: templates/authopenid/complete.html:47
-msgid "Email (<i>not shared with anyone</i>)"
-msgstr "Email (<i>no será compartido con nadie</i>)"
+msgid "Screen name label"
+msgstr ""
 
 #: templates/authopenid/complete.html:48
+#, fuzzy
+msgid "Email address label"
+msgstr "su email (correo electrónico)"
+
+#: templates/authopenid/complete.html:49
 msgid "create account"
 msgstr "crear cuenta"
 
@@ -2157,15 +2221,46 @@ msgstr "contraseña"
 msgid "Register"
 msgstr "Registrarse"
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:62
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: templates/authopenid/delete.html:8
+#: templates/authopenid/confirm_email.txt:2
+msgid "Thank you for registering at our Q&A forum!"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:4
+msgid "Your account details are:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:6
+#: templates/authopenid/sendpw_email.txt:7
+#, fuzzy
+msgid "Username:"
+msgstr "Nombre de usuario"
+
+#: templates/authopenid/confirm_email.txt:7
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr "Contraseña"
+
+#: templates/authopenid/confirm_email.txt:9
+msgid "Please sign in here:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:12
+#: templates/authopenid/email_validation.txt:14
+#: templates/authopenid/sendpw_email.txt:13
+msgid ""
+"Sincerely,\n"
+"Forum Administrator"
+msgstr ""
+
+#: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr "Cuenta: borrar cuenta"
 
-#: templates/authopenid/delete.html:12
+#: templates/authopenid/delete.html:13
 msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
@@ -2173,39 +2268,54 @@ msgstr ""
 "Nota: Luego de borrar tu cuenta, cualquiera podrá registrarse con este "
 "nombre de usuario."
 
-#: templates/authopenid/delete.html:16
+#: templates/authopenid/delete.html:17
 msgid "Check confirm box, if you want delete your account."
 msgstr "Marca caja de confirmación, si deseas borrar tu cuenta."
 
-#: templates/authopenid/delete.html:19
-msgid "Password:"
-msgstr "Contraseña"
-
-#: templates/authopenid/delete.html:31
+#: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr "Estoy seguro que quiero borrar mi cuenta."
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "Password/OpenID URL"
 msgstr "Contraseña/OpenID URL"
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:33
 msgid "(required for your security)"
 msgstr "(requerido por tu seguridad)"
 
-#: templates/authopenid/delete.html:34
+#: templates/authopenid/delete.html:35
 msgid "Delete account permanently"
 msgstr "Borrar la cuenta de forma permanente"
 
-#: templates/authopenid/sendpw.html:3 templates/authopenid/sendpw.html.py:7
+#: templates/authopenid/email_validation.txt:2
+msgid "Greetings from the Q&A forum"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:4
+msgid "To make use of the Forum, please follow the link below:"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:8
+msgid "Following the link above will help us verify your email address."
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:10
+msgid ""
+"If you beleive that this message was sent in mistake - \n"
+"no further action is needed. Just ingore this email, we apologize\n"
+"for any inconvenience"
+msgstr ""
+
+#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr "Enviar nueva contraseña"
 
-#: templates/authopenid/sendpw.html:11
+#: templates/authopenid/sendpw.html:12
 msgid "Lost your password? No problem - here you can reset it."
 msgstr "¿Haz perdido tu contraseña? No hay problema - aquí puedes re-crearla."
 
-#: templates/authopenid/sendpw.html:12
+#: templates/authopenid/sendpw.html:13
 msgid ""
 "Please enter your username below and new password will be sent to your "
 "registered e-mail"
@@ -2213,15 +2323,19 @@ 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
+#: templates/authopenid/sendpw.html:28
+msgid "User name"
+msgstr "Nombre de usuario"
+
+#: templates/authopenid/sendpw.html:30
 msgid "Reset password"
 msgstr "Re-crear contraseña"
 
-#: templates/authopenid/sendpw.html:29
+#: templates/authopenid/sendpw.html:30
 msgid "return to login"
 msgstr "volver a 'Ingresar'"
 
-#: templates/authopenid/sendpw.html:32
+#: templates/authopenid/sendpw.html:33
 msgid ""
 "Note: your new password will be activated only after you click the "
 "activation link in the email message"
@@ -2229,104 +2343,146 @@ 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
+#: templates/authopenid/sendpw_email.txt:2
+#, python-format
+msgid ""
+"Someone has requested to reset your password on %(site_url)s.\n"
+"If it were not you, it is safe to ignore this email."
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:5
+msgid "Your new account details are:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:8
+#, fuzzy
+msgid "New password:"
+msgstr "Nueva contraseña"
+
+#: templates/authopenid/sendpw_email.txt:10
+msgid "To confirm that you wanted to reset your password please visit:"
+msgstr ""
+
+#: templates/authopenid/settings.html:30
 msgid "Give your  account a new password."
 msgstr "Crea una nueva contraseña para tu cuenta."
 
-#: templates/authopenid/settings.html:30
+#: templates/authopenid/settings.html:31
 msgid "Change email "
 msgstr "Cambiar email "
 
-#: templates/authopenid/settings.html:31
+#: templates/authopenid/settings.html:32
 msgid "Add or update the email address associated with your account."
 msgstr "Agrega o actualiza el email asociado a tu cuenta."
 
-#: templates/authopenid/settings.html:34
+#: templates/authopenid/settings.html:35
 msgid "Change openid associated to your account"
 msgstr "Cambia el OpenID asociado a tu cuenta"
 
-#: templates/authopenid/settings.html:37
+#: templates/authopenid/settings.html:38
 msgid "Delete account"
 msgstr "Eliminar cuenta"
 
-#: templates/authopenid/settings.html:38
+#: templates/authopenid/settings.html:39
 msgid "Erase your username and all your data from website"
 msgstr "Eliminar tu nombre de usuario y toda tu información del sitio"
 
-#: templates/authopenid/signin.html:3 templates/authopenid/signin.html:16
+#: templates/authopenid/signin.html:4 templates/authopenid/signin.html:21
 msgid "User login"
 msgstr "Ingreso de usuario"
 
-#: templates/authopenid/signin.html:21
-msgid "we support two login modes"
+#: templates/authopenid/signin.html:28
+#, python-format
+msgid ""
+"\n"
+"                Your answer to %(title)s %(summary)s will be posted once you "
+"log in\n"
+"                "
 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 "Ingresar con tu OpenID"
+#: templates/authopenid/signin.html:35
+#, python-format
+msgid ""
+"Your question \n"
+"                %(title)s %(summary)s will be posted once you log in\n"
+"                "
+msgstr ""
 
-#: templates/authopenid/signin.html:28
-msgid "select openid provider"
-msgstr "1) Selecciona tu proveedor de OpenID"
+#: templates/authopenid/signin.html:40
+msgid "Click to sign in through any of these services."
+msgstr ""
 
-#: templates/authopenid/signin.html:32
-msgid "verify openid link and login"
+#: templates/authopenid/signin.html:103
+msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
 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
+#: templates/authopenid/signin.html:110
+msgid ""
+"Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
+"web address"
+msgstr ""
+
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
+msgid "Login"
+msgstr "Ingresar"
+
+#: templates/authopenid/signin.html:116
+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:136
 msgid "Use login name and password"
 msgstr "Nombre de usuario y contraseña"
 
-#: templates/authopenid/signin.html:59
+#: templates/authopenid/signin.html:137
 msgid "Login name"
 msgstr "Nombre de usuario"
 
-#: templates/authopenid/signin.html:63
-msgid "Create new acccount"
+#: templates/authopenid/signin.html:141
+#, fuzzy
+msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-#: templates/authopenid/signin.html:72
+#: templates/authopenid/signin.html:150
 msgid "Why use OpenID?"
 msgstr "¿Porqué usar OpenID?"
 
-#: templates/authopenid/signin.html:76
+#: templates/authopenid/signin.html:154
 msgid "with openid it is easier"
 msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña."
 
-#: templates/authopenid/signin.html:79
+#: templates/authopenid/signin.html:157
 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
+#: templates/authopenid/signin.html:160
 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
+#: templates/authopenid/signin.html:163
 msgid "openid is supported open standard"
 msgstr ""
 "OpenID es basado en un standard abierto, apoyado por muchas organizaciones."
 
-#: templates/authopenid/signin.html:89
+#: templates/authopenid/signin.html:167
 msgid "Find out more"
 msgstr "Averigua más"
 
-#: templates/authopenid/signin.html:90
+#: templates/authopenid/signin.html:168
 msgid "Get OpenID"
 msgstr "Adquiere una OpenID"
 
-#: templates/authopenid/signup.html:2 templates/authopenid/signup.html.py:6
+#: templates/authopenid/signup.html:4 templates/authopenid/signup.html.py:8
 msgid "Signup"
 msgstr "Registrate"
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid ""
 "We support two types of user registration: conventional username/password, "
 "and"
@@ -2334,66 +2490,195 @@ msgstr ""
 "Soportamos dos formas de registro de usuario: convencional usuario/"
 "contraseña, y"
 
-#: templates/authopenid/signup.html:10
+#: templates/authopenid/signup.html:12
 msgid "the OpenID method"
 msgstr "OpenID"
 
-#: templates/authopenid/signup.html:15
+#: templates/authopenid/signup.html:17
 msgid "Sorry, looks like we have some errors"
 msgstr "Ups, parece que hay errores."
 
-#: templates/authopenid/signup.html:33
+#: templates/authopenid/signup.html:35
 msgid "Conventional registration"
 msgstr "Registro clásico"
 
-#: templates/authopenid/signup.html:34
+#: templates/authopenid/signup.html:36
 msgid "choose a user name"
 msgstr "elije un nombre de usuario"
 
-#: templates/authopenid/signup.html:40
+#: templates/authopenid/signup.html:42
 msgid "back to login"
 msgstr "volver al ingreso de usuario"
 
-#: templates/authopenid/signup.html:46
+#: templates/authopenid/signup.html:48
 msgid "Register with your OpenID"
 msgstr "Registrate con tu OpenID"
 
-#: templates/tough/question_retag.html:2
-msgid "Revise tags"
-msgstr "Revisar etiquetas"
+#: templates/authopenid/signup.html:51
+msgid "Login with your OpenID"
+msgstr "Ingresar con tu OpenID"
 
-#: templates/tough/question_retag.html:37
-msgid "tags are requried"
-msgstr "las etiquetas son requeridas"
+#~ msgid "site slogan"
+#~ msgstr " slogan del sitio"
 
-#: templates/tough/question_retag.html:38
-msgid "up to 5 tags, less than 20 characters each"
-msgstr "hasta 5 etiquetas, menos de 20 caracteres cada una"
+#~ msgid "meta site content"
+#~ msgstr "meta descripción"
 
-#: templates/tough/question_retag.html:51
-msgid "Change tags"
-msgstr "Cambiar etiquetas"
+#~ msgid "copyright message"
+#~ msgstr "mensaje de copyright"
 
-#: templates/tough/question_retag.html:74
-msgid "Change now"
-msgstr "Cambiar ahora"
+#~ msgid ""
+#~ "please use space to separate tags (this enables autocomplete feature)"
+#~ msgstr ""
+#~ "por favor utilice espacio para separar las etiquetas (esto habilitael "
+#~ "auto-completado)"
 
-#: templates/tough/question_retag.html:85
-msgid "Why use and modify tags?"
-msgstr "¿Porqué usar y modificar etiquetas?"
+#~ msgid "Use"
+#~ msgstr "Usar"
 
-#: templates/tough/question_retag.html:96
-msgid "tag editors receive special awards from the community"
-msgstr ""
-"los editores de etiquetas reciben distinciones especiales de la comunidad"
+#~ msgid "learn more about OpenID"
+#~ msgstr "aprender mas sobre OpenID"
+
+#~ msgid "Get your own "
+#~ msgstr "Obtiene tu propio "
+
+#~ msgid "Email: (won't be shown to anyone)"
+#~ msgstr "Email: (no será mostrado a nadie)"
+
+#, fuzzy
+#~ msgid "Congratulations! You have new badges: "
+#~ msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
+
+#, fuzzy
+#~ msgid "go to see"
+#~ msgstr "OK para cerrar"
+
+#~ msgid "congratulations, community gave you a badge"
+#~ msgstr "felicitaciones, la comunidad te ha otorgado una distinción"
+
+#~ msgid "see"
+#~ msgstr "ver"
+
+#~ msgid "profile"
+#~ msgstr "perfil"
+
+#~ msgid ""
+#~ "Anyone can ask questions and give answers, points are not necessary for "
+#~ "that."
+#~ msgstr ""
+#~ "Cualquier usuario puede hacer preguntas y dar respuestas, no es necesario "
+#~ "tener reputación para ello."
+
+#~ msgid ""
+#~ "As we've said before, users help running this site. Point system helps "
+#~ "select users who can administer this community."
+#~ msgstr ""
+#~ "Como dijimos antes, los usuarios ayudan a crear este sitio. El sistema de "
+#~ "reputación permite seleccionar usuarios que pueden moderar esta comunidad."
+
+#~ msgid ""
+#~ "Reputation points roughly measure how community trusts you. These points "
+#~ "are given to you directly by other members of the community."
+#~ msgstr ""
+#~ "Los puntos de reputación miden a groso modo que tan respetado eres en la "
+#~ "comunidad. Los puntos son dados a ti directamente por otros miembros de "
+#~ "la comunidad"
+
+#~ msgid ""
+#~ "For example, if you ask an interesting question or give a helpful answer, "
+#~ "your input will be upvoted and you will gain more trust in the community."
+#~ msgstr ""
+#~ "Por ejemplo, si haces una pregunta interesante, o das una respuesta "
+#~ "valiosa, tu entrada va a ser votada positivamente y tu ganarás confianza "
+#~ "en la comunidad."
+
+#~ msgid ""
+#~ "If on the other hand someone gives a misleading answer, the answer will "
+#~ "be voted down and he/she loses some points."
+#~ msgstr ""
+#~ "Si por el contrario, alguien da una respuesta que no corresponde, la "
+#~ "respuesta será votada negativamente y el usuario perderá puntos."
+
+#~ msgid ""
+#~ "Each vote in favor will generate <strong>10</strong> points, each vote "
+#~ "against will subtract <strong>2</strong> points."
+#~ msgstr ""
+#~ "Cada voto a favor generará <strong>10</strong> puntos, cada voto negativo "
+#~ "restará <strong>2</strong> puntos."
 
-#: templates/tough/unanswered.html:95
-msgid "number of <strong>unanswered</strong> questions"
-msgstr "número de respuestas <strong>sin responder</strong>"
+#~ msgid ""
+#~ "Through the votes of other people you can accumulate a maximum of "
+#~ "<strong>200</strong> points."
+#~ msgstr ""
+#~ "A través del voto de otras personas puedes acumular un máximo de "
+#~ "<strong>200</strong> puntos."
+
+#~ msgid "After accumulating certain number of points, you can do more:"
+#~ msgstr ""
+#~ "Luego de haber acumulado cierta cantidad de puntos, puedes hacer más:"
+
+#~ msgid "meta site keywords, comma separated"
+#~ msgstr "palabras claves"
+
+#~ msgid "what is this website"
+#~ msgstr "que es este sitio"
+
+#~ msgid "what can one do on this website"
+#~ msgstr "que puede uno hacer en este sitio"
+
+#~ msgid "Login to answer"
+#~ msgstr "Ingresa para responder"
+
+#~ msgid "Account: change email"
+#~ msgstr "Cuenta: cambiar el email"
+
+#~ msgid ""
+#~ "This is where you can change the email address associated with your "
+#~ "account. 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."
+
+#~ msgid "Email"
+#~ msgstr "Email"
 
-#~ msgid "Community gives you awards for your questions, answers and votes."
+#~ msgid ""
+#~ "Your OpenID is accepted. Please complete this to finish registration."
 #~ msgstr ""
-#~ "La comunidad te da distinciones por tus preguntas, respuestas y votos."
+#~ "Tu OpenID es aceptada. Por favor completa lo siguiente para finalizar el "
+#~ "registro."
+
+#~ msgid "New account"
+#~ msgstr "Nueva cuenta"
+
+#~ msgid "User name (<i>will be shown to others, cannot be modified</i>)"
+#~ msgstr ""
+#~ "Nombre de usuario (<i>será mostrado a otros, no puede ser modificado</i>)"
+
+#~ msgid "Email (<i>not shared with anyone</i>)"
+#~ msgstr "Email (<i>no será compartido con nadie</i>)"
+
+#~ msgid "select openid provider"
+#~ msgstr "1) Selecciona tu proveedor de OpenID"
+
+#~ 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'"
+
+#~ msgid "Revise tags"
+#~ msgstr "Revisar etiquetas"
+
+#~ msgid "tags are requried"
+#~ msgstr "las etiquetas son requeridas"
+
+#~ msgid "Change now"
+#~ msgstr "Cambiar ahora"
+
+#~ msgid "number of <strong>unanswered</strong> questions"
+#~ msgstr "número de respuestas <strong>sin responder</strong>"
 
 #
 #~ msgid "editing tips"
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
deleted file mode 100644
index cfcea03d..00000000
Binary files a/locale/zh_CN/LC_MESSAGES/django.mo and /dev/null differ
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index a34a35f2..4d8524b6 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -379,7 +379,7 @@ msgstr "多个标签请用空格间隔-最多5个标签。（优先使用自动
 
 #: forum/forms.py:53
 msgid "tags are required"
-msgstr "标签不能为空。"
+msgstr " 标签不能为空。"
 
 #: forum/forms.py:57
 msgid "please use 5 tags or less"
@@ -692,6 +692,9 @@ msgstr "预览开关"
 msgid "Save edit"
 msgstr "现在修改"
 
+msgid "Save"
+msgstr "保存"
+
 #: templates/answer_edit.html:74 templates/close.html:29
 #: templates/question_edit.html:120 templates/reopen.html:30
 #: templates/user_edit.html:83
@@ -762,18 +765,16 @@ msgid "Community badges"
 msgstr "社区奖牌"
 
 #: templates/badges.html:53
-#, fuzzy
-msgid ""
+msgid "gold badge description"
 "Gold badge is very rare. To obtain it you have to show profound knowledge "
 "and ability in addition to actively participating in the community. Gold "
 "badge is the highest award in this community."
 msgstr ""
-"你不仅要参与社区的提问、回答、投票等活动，而且需要有高深的知识和能力才能获"
+"金牌是十分罕见的。你不仅要参与社区的提问、回答、投票等活动，而且需要有高深的知识和能力才能获"
 "得。"
 
 #: templates/badges.html:61
-#, fuzzy
-msgid ""
+msgid "silver badge description"
 "Obtaining silver badge requires significant patience. If you got one, you've "
 "very significantly contributed to this community"
 msgstr "它是不同寻常的荣誉，只要你付出足够的努力就会得到。"
@@ -782,9 +783,24 @@ msgstr "它是不同寻常的荣誉，只要你付出足够的努力就会得到
 msgid "bronze badge: often given as a special honor"
 msgstr "铜牌:时常授予之特殊荣誉"
 
+msgid "Connect with Twitter"
+msgstr "同步Twitter消息"
+
+msgid "Twitter account name:"
+msgstr "账号:"
+
+msgid "Twitter password:"
+msgstr "密码:"
+
+msgid "Send my Questions to Twitter"
+msgstr "发布我的提问到我的Twitter"
+
+msgid "Send my Answers to Twitter"
+msgstr "发布我的回答到我的Twitter"
+
 #: templates/badges.html:68
 #, fuzzy
-msgid ""
+msgid "bronze badge description"
 "If you are active in this community, you will get this medal - still it is a "
 "special honor."
 msgstr "铜牌会在你活跃于社区时产生，它相对容易获得，但也是一种特殊的荣誉。"
@@ -1660,6 +1676,9 @@ msgstr "用户投的反对票总数"
 msgid "Tags"
 msgstr "个标签"
 
+msgid "Tags help us keep Questions organized"
+msgstr "CNProg用标签来分类系统的信息"
+
 #: templates/user_stats.html:94
 #, fuzzy, python-format
 msgid "see other questions tagged '%(tag)s' "
-- 
cgit v1.2.3-1-g7c22


From ba4363f23c06e522cdfc2349c8b0112867247f42 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 5 Aug 2009 22:55:30 -0400
Subject: added some more files

---
 locale/en/LC_MESSAGES/django.mo    | Bin 0 -> 15885 bytes
 locale/es/LC_MESSAGES/django.mo    | Bin 0 -> 39157 bytes
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 0 -> 37880 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 locale/en/LC_MESSAGES/django.mo
 create mode 100644 locale/es/LC_MESSAGES/django.mo
 create mode 100644 locale/zh_CN/LC_MESSAGES/django.mo

(limited to 'locale')

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..39dba67d
Binary files /dev/null and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..a68a2fd3
Binary files /dev/null and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..5173c858
Binary files /dev/null and b/locale/zh_CN/LC_MESSAGES/django.mo differ
-- 
cgit v1.2.3-1-g7c22


From 48703d2eb746ba3fe911df9c61793abaced3729a Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Fri, 7 Aug 2009 11:22:37 -0600
Subject: adding some translation, fixing translation errors (Spanish)

---
 locale/es/LC_MESSAGES/django.mo | Bin 39157 -> 42843 bytes
 locale/es/LC_MESSAGES/django.po | 137 ++++++++++++++++++----------------------
 2 files changed, 60 insertions(+), 77 deletions(-)

(limited to 'locale')

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index a68a2fd3..a2a27c2f 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index a8ac642a..b209c72c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"PO-Revision-Date: 2009-08-07 11:21-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -117,14 +117,12 @@ msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
 #: django_authopenid/urls.py:10
-#, fuzzy
 msgid "newquestion/"
-msgstr "pregunta"
+msgstr "nueva-pregunta/"
 
 #: django_authopenid/urls.py:11
-#, fuzzy
 msgid "newanswer/"
-msgstr "resputa"
+msgstr "respuesta-nueva/"
 
 #: django_authopenid/urls.py:12
 msgid "signout/"
@@ -165,17 +163,17 @@ msgstr "Contraseña modificada"
 
 #: django_authopenid/views.py:519 django_authopenid/views.py:524
 msgid "your email needs to be validated"
-msgstr ""
+msgstr "su correo electrónico necesita ser validado"
 
 #: django_authopenid/views.py:681 django_authopenid/views.py:833
 #, python-format
 msgid "No OpenID %s found associated in our database"
-msgstr "La OpenID %s no esta asociada en nuestra base de datos"
+msgstr "El OpenID %s no esta asociada en nuestra base de datos"
 
 #: django_authopenid/views.py:685 django_authopenid/views.py:840
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
-msgstr "La OpenID %s no esta asociada al usuario actualmente autenticado"
+msgstr "El OpenID %s no esta asociada al usuario actualmente autenticado"
 
 #: django_authopenid/views.py:693
 msgid "Email Changed."
@@ -183,12 +181,12 @@ msgstr "Email modificado"
 
 #: django_authopenid/views.py:768
 msgid "This OpenID is already associated with another account."
-msgstr "Esta OpenID ya está asociada a otra cuenta."
+msgstr "Este OpenID ya está asociada a otra cuenta."
 
 #: django_authopenid/views.py:773
 #, python-format
 msgid "OpenID %s is now associated with your account."
-msgstr "La OpenID %s está ahora asociada con tu cuenta."
+msgstr "El OpenID %s está ahora asociada con tu cuenta."
 
 #: django_authopenid/views.py:843
 msgid "Account deleted."
@@ -349,23 +347,22 @@ msgid "latest questions"
 msgstr "últimas preguntas"
 
 #: forum/feed.py:19
-#, fuzzy
 msgid "questions/"
-msgstr "preguntas"
+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
 msgid "title"
-msgstr "titulo"
+msgstr "título"
 
 #: forum/forms.py:15
 msgid "please enter a descriptive title for your question"
-msgstr "ingrese un titulo descriptivo para su pregunta"
+msgstr "ingrese un título descriptivo para su pregunta"
 
 #: forum/forms.py:20
 msgid "title must be > 10 characters"
-msgstr "el titulo debe tener al menos 10 caracteres"
+msgstr "el título debe tener al menos 10 caracteres"
 
 #: forum/forms.py:29
 msgid "content"
@@ -466,27 +463,27 @@ msgstr "este email ya ha sido registrado, por favor use otro"
 #: forum/models.py:238
 #, fuzzy, python-format
 msgid "%(author)s modified the question"
-msgstr "Cerrar la pregunta"
+msgstr "%(author) modificó la pregunta"
 
 #: forum/models.py:242
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
-msgstr ""
+msgstr "%(people)s publicaron %(new_answer_count)s nuevas respuestas"
 
 #: forum/models.py:247
-#, fuzzy, python-format
+#, python-format
 msgid "%(people)s commented the question"
-msgstr "pregunta comentada"
+msgstr "%(people)s comentarion la pregunta"
 
 #: forum/models.py:252
-#, fuzzy, python-format
+#, python-format
 msgid "%(people)s commented answers"
-msgstr "respuesta comentada"
+msgstr "%(people)s comentaron la respuesta"
 
 #: forum/models.py:254
-#, fuzzy, python-format
+#, python-format
 msgid "%(people)s commented the answer"
-msgstr "respuesta comentada"
+msgstr "%(people)s comentaron la respuestas"
 
 #: forum/models.py:433 templates/badges.html:52
 msgid "gold"
@@ -585,14 +582,13 @@ msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
 #: forum/views.py:304
-#, fuzzy
 msgid "/account/"
-msgstr "cuenta/"
+msgstr "/cuenta/"
 
 #: forum/views.py:943
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
-msgstr ""
+msgstr "subscripción guardada, %(email)s necesita validación"
 
 #: forum/views.py:1853
 msgid "uploading images is limited to users with >60 reputation points"
@@ -617,9 +613,8 @@ msgstr ""
 "Error al subir el archivo. Por favor, contacte al administrador. Gracias. %s"
 
 #: forum/management/commands/send_email_alerts.py:35
-#, fuzzy
 msgid "updates from website"
-msgstr "sitio web del usuario"
+msgstr "actualizaciones del sitio"
 
 #: forum/templatetags/extra_tags.py:139 forum/templatetags/extra_tags.py:168
 #: templates/header.html:33
@@ -818,25 +813,24 @@ msgstr "aprender mas sobre Markdown"
 
 #: templates/ask.html:4 templates/ask.html.py:60
 msgid "Ask a question"
-msgstr "Hacer una pregunta"
+msgstr "Preguntar"
 
 #: templates/ask.html:67
-#, fuzzy
 msgid "login to post question info"
-msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
+msgstr "Inicie sesión para publicar pregunta."
 
 #: templates/ask.html:73
 #, python-format
 msgid "must have valid %(email)s to post"
-msgstr ""
+msgstr "debe de tener un %(email)s válido para publicar"
 
 #: templates/ask.html:108
 msgid "(required)"
-msgstr ""
+msgstr "(requerido)"
 
 #: templates/ask.html:115
 msgid "Login/signup to post your question"
-msgstr ""
+msgstr "Iniciar sesión/registrarse para publicar su pregunta"
 
 #: templates/ask.html:117
 msgid "Ask your question"
@@ -863,13 +857,11 @@ msgid "Community gives you awards for your questions, answers and votes."
 msgstr "La comunidad te da distinciones por tus preguntas, respuestas y votos."
 
 #: templates/badges.html:22
-#, fuzzy
 msgid ""
 "Below is 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 "
+"Debajo esta la lista de las distinciones disponibles y la cantidad de "
 "veces que han sido asignadas."
 
 #: templates/badges.html:49
@@ -1054,7 +1046,7 @@ msgstr "¿Que debo evitar en mis respuestas?"
 
 #: templates/faq.html:28 templates/faq.html.py:132
 msgid "site title"
-msgstr "titulo del sitio"
+msgstr "título del sitio"
 
 #: templates/faq.html:28
 msgid ""
@@ -1091,9 +1083,8 @@ msgid "How does reputation system work?"
 msgstr "¿Cómo funciona el sistema de reputación?"
 
 #: templates/faq.html:41
-#, fuzzy
 msgid "Rep system summary"
-msgstr "resumen de modificación"
+msgstr "resumen del sistema de reputación"
 
 #: templates/faq.html:59 templates/user_votes.html:14
 msgid "upvote"
@@ -1112,9 +1103,8 @@ msgid "downvote"
 msgstr "votar negativo"
 
 #: templates/faq.html:75
-#, fuzzy
 msgid "open and close own questions"
-msgstr "abrir cualquier pregunta cerrada"
+msgstr "abrir y cerrar sus propias preguntas"
 
 #: templates/faq.html:79
 msgid "retag questions"
@@ -1144,19 +1134,19 @@ msgstr ""
 
 #: templates/faq.html:106
 msgid "how to validate email title"
-msgstr ""
+msgstr "como validar el título del correo"
 
 #: templates/faq.html:108
 msgid "how to validate email info"
-msgstr ""
+msgstr "como validar la información del correo"
 
 #: templates/faq.html:112
 msgid "what is gravatar"
-msgstr ""
+msgstr "qué es gravatar"
 
 #: templates/faq.html:113
 msgid "gravatar faq info"
-msgstr ""
+msgstr "preguntas frecuentes sobre gravatar"
 
 #: templates/faq.html:116
 msgid "To register, do I need to create new password?"
@@ -1211,7 +1201,7 @@ msgstr "preguntas"
 
 #: templates/faq.html:132 templates/index.html:121
 msgid "."
-msgstr ""
+msgstr "."
 
 #: templates/footer.html:7 templates/header.html:14 templates/index.html:83
 msgid "about"
@@ -1365,7 +1355,6 @@ msgid "Still looking for more? See"
 msgstr "¿Aún sigues buscando más? Ver"
 
 #: templates/index.html:121
-#, fuzzy
 msgid "complete list of questions"
 msgstr "lista completa de preguntas"
 
@@ -1378,9 +1367,8 @@ msgid "Please help us answer"
 msgstr "Ayudanos a responder"
 
 #: templates/index.html:121
-#, fuzzy
 msgid "list of unanswered questions"
-msgstr "sin respuesta"
+msgstr "lista de preguntas sin respuesta"
 
 #: templates/logout.html:6 templates/logout.html.py:17
 msgid "Logout"
@@ -1696,7 +1684,7 @@ msgstr "Encontradas por etiqueta"
 
 #: templates/questions.html:23
 msgid "Found by title"
-msgstr "Encontradas por titulo"
+msgstr "Encontradas por título"
 
 #: templates/questions.html:23
 msgid "All questions"
@@ -1715,7 +1703,7 @@ msgid "active"
 msgstr "actividad"
 
 #: templates/questions.html:109
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
@@ -1724,8 +1712,12 @@ msgid_plural ""
 "\n"
 "\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
 "\t\t\t"
-msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
-msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
+msgstr[0] "\n" 
+"\t\t\ttiene un total de %(q_num)s preguntas etiquetadas con %(tagname)s\n"
+"\t\t\t"
+msgstr[1] "\n"
+"\t\t\ttiene un total de %(q_num)s preguntas etiquetadas con %(tagname)s\n"
+"\t\t\t"
 
 #: templates/questions.html:116
 #, fuzzy, python-format
@@ -1941,27 +1933,24 @@ msgid "Connect with Twitter"
 msgstr ""
 
 #: templates/user_preferences.html:12
-#, fuzzy
 msgid "Twitter account name:"
-msgstr "Esta cuenta esta inactiva."
+msgstr "Nombre de usuario en Twitter:"
 
 #: templates/user_preferences.html:14
-#, fuzzy
 msgid "Twitter password:"
-msgstr "Nueva contraseña"
+msgstr "Contraseña de Twitter:"
 
 #: templates/user_preferences.html:16
 msgid "Send my Questions to Twitter"
-msgstr ""
+msgstr "Enviar mis preguntas a Twitter"
 
 #: templates/user_preferences.html:17
 msgid "Send my Answers to Twitter"
-msgstr ""
+msgstr "Enviar mis respuestas a Twitter"
 
 #: templates/user_preferences.html:18
-#, fuzzy
 msgid "Save"
-msgstr "Guardar la edición"
+msgstr "Guardar"
 
 #: templates/user_stats.html:15
 msgid "User questions"
@@ -2064,7 +2053,7 @@ msgstr "Cambiar dirección email"
 #: templates/authopenid/changeemail.html:10
 #, fuzzy, python-format
 msgid "change %(email)s info"
-msgstr "Cambiar email "
+msgstr "Cambiar información del correo electrónico "
 
 #: templates/authopenid/changeemail.html:13
 #: templates/authopenid/changeopenid.html:14
@@ -2093,9 +2082,8 @@ msgid "validate %(email)s info"
 msgstr ""
 
 #: templates/authopenid/changeemail.html:50
-#, fuzzy
 msgid "Email not changed"
-msgstr "Email modificado."
+msgstr "Email no modificado."
 
 #: templates/authopenid/changeemail.html:53
 #, python-format
@@ -2103,7 +2091,6 @@ msgid "old %(email)s kept"
 msgstr ""
 
 #: templates/authopenid/changeemail.html:58
-#, fuzzy
 msgid "Email changed"
 msgstr "Email modificado."
 
@@ -2114,15 +2101,15 @@ msgstr ""
 
 #: templates/authopenid/changeemail.html:66
 msgid "Email verified"
-msgstr ""
+msgstr "Email verificado"
 
 #: templates/authopenid/changeemail.html:69
 msgid "thanks for verifying email"
-msgstr ""
+msgstr "gracias por verificar su correo"
 
 #: templates/authopenid/changeemail.html:74
 msgid "email key not sent"
-msgstr ""
+msgstr "llave de correo no enviada"
 
 #: templates/authopenid/changeemail.html:77
 #, python-format
@@ -2197,7 +2184,6 @@ msgid "Screen name label"
 msgstr ""
 
 #: templates/authopenid/complete.html:48
-#, fuzzy
 msgid "Email address label"
 msgstr "su email (correo electrónico)"
 
@@ -2231,11 +2217,10 @@ msgstr ""
 
 #: templates/authopenid/confirm_email.txt:4
 msgid "Your account details are:"
-msgstr ""
+msgstr "Los detalles de su cuenta son:"
 
 #: templates/authopenid/confirm_email.txt:6
 #: templates/authopenid/sendpw_email.txt:7
-#, fuzzy
 msgid "Username:"
 msgstr "Nombre de usuario"
 
@@ -2246,7 +2231,7 @@ msgstr "Contraseña"
 
 #: templates/authopenid/confirm_email.txt:9
 msgid "Please sign in here:"
-msgstr ""
+msgstr "Por favor inicie sesión aquí:"
 
 #: templates/authopenid/confirm_email.txt:12
 #: templates/authopenid/email_validation.txt:14
@@ -2294,11 +2279,11 @@ msgstr ""
 
 #: templates/authopenid/email_validation.txt:4
 msgid "To make use of the Forum, please follow the link below:"
-msgstr ""
+msgstr "Para usar el Foro, siga el siguiente enlace:"
 
 #: templates/authopenid/email_validation.txt:8
 msgid "Following the link above will help us verify your email address."
-msgstr ""
+msgstr "El siguiente enlace nos ayudará a verificar su correo electrónico."
 
 #: templates/authopenid/email_validation.txt:10
 msgid ""
@@ -2355,7 +2340,6 @@ msgid "Your new account details are:"
 msgstr ""
 
 #: templates/authopenid/sendpw_email.txt:8
-#, fuzzy
 msgid "New password:"
 msgstr "Nueva contraseña"
 
@@ -2441,7 +2425,6 @@ msgid "Login name"
 msgstr "Nombre de usuario"
 
 #: templates/authopenid/signin.html:141
-#, fuzzy
 msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-- 
cgit v1.2.3-1-g7c22


From 46da3fdbe80ea1f6b9278d2671757d5fdb8abcfb Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 7 Aug 2009 18:47:02 -0400
Subject: added spanish mods by Adolfo, fix in email notification and minor
 template change, removed site-specific staff from english .po file

---
 locale/en/LC_MESSAGES/django.mo | Bin 15885 -> 13992 bytes
 locale/en/LC_MESSAGES/django.po |  27 +++------------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

(limited to 'locale')

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 39dba67d..11d15deb 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 cc42454c..3dda9ce9 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -148,7 +148,7 @@ msgstr ""
 
 #: django_authopenid/views.py:417 django_authopenid/views.py:544
 msgid "Welcome"
-msgstr "Verification Email from NMR Wiki Q&A"
+msgstr "Verification Email from Q&A forum"
 
 #: django_authopenid/views.py:507
 msgid "Password changed."
@@ -1013,12 +1013,6 @@ msgid ""
 "Most importanly - questions should be <strong>relevant</strong> to this "
 "community."
 msgstr ""
-"Please ask questions about all aspects of <strong>Magnetic Resonance</"
-"strong> - <strong>NMR</strong>, <strong>EPR</strong>, <strong>MRI</strong>. "
-"Questions about both theory and practice in these fields are welcome, "
-"including questions about the physical foundations, scientific applications, "
-"instrumentation, interpretation of data, software, preparation and handling "
-"of samples etc. "
 
 #: templates/faq.html:18
 msgid ""
@@ -1037,9 +1031,6 @@ msgid ""
 "Please avoid asking questions that are not relevant to this community, too "
 "subjective and argumentative."
 msgstr ""
-"Please avoid asking questions that are not relevant to the subjects of NMR, "
-"EPR or MRI, also please avoid asking questions that are too argumentative or "
-"subjective."
 
 #: templates/faq.html:27
 msgid "What should I avoid in my answers?"
@@ -1047,7 +1038,7 @@ msgstr ""
 
 #: templates/faq.html:28 templates/faq.html.py:132
 msgid "site title"
-msgstr "NMR Wiki Q&A"
+msgstr ""
 
 #: templates/faq.html:28
 msgid ""
@@ -1190,9 +1181,6 @@ msgstr ""
 #: templates/faq.html:124
 msgid "Goal of this site is..."
 msgstr ""
-"<span class='orange'>NMR Wiki Q&A</span> aims for offering a place for "
-"efficient exchange of ideas among users of <strong>Magnetic Resonance</"
-"strong>and specialists working in this field."
 
 #: templates/faq.html:124
 msgid ""
@@ -1339,7 +1327,7 @@ msgstr ""
 
 #: templates/index.html:80
 msgid "welcome to website"
-msgstr "Welcome to NMR Wiki Q&A"
+msgstr ""
 
 #: templates/index.html:89
 msgid "Recent tags"
@@ -1399,9 +1387,6 @@ msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
-"Clicking <strong>Logout</strong> will log you out from NMR Wiki Q&A.</"
-"p><p>If you wish to sign off completely - please make sure to log out from "
-"your OpenID provider."
 
 #: templates/logout.html:21
 msgid "Logout now"
@@ -2107,12 +2092,6 @@ msgstr ""
 #, python-format
 msgid "validate %(email)s info"
 msgstr ""
-"<span class=\"strong big\">An email with a validation link has been sent to %"
-"(email)s.</span> Please <strong>follow the emailed link</strong> with your "
-"web browser. Email validation is necessary to help insure the proper use of "
-"email on <span class=\"orange\">NMR Wiki Q&A</span>. If you would like to "
-"use <strong>another email</strong>, please <a href=\"/email/change/"
-"\"><strong>change it again</strong></a>."
 
 #: templates/authopenid/changeemail.html:50
 msgid "Email not changed"
-- 
cgit v1.2.3-1-g7c22


From d93c8261fe3a16fd9232aab7fbed8718a41439cf Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'locale')

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 <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
cgit v1.2.3-1-g7c22


From e9e5b0c7f5f71e439c4b028d30ff828baf9cc4d4 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Sun, 9 Aug 2009 18:42:48 -0600
Subject: fixing a translation (to fit style)

---
 locale/es/LC_MESSAGES/django.mo | Bin 42843 -> 42834 bytes
 locale/es/LC_MESSAGES/django.po |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'locale')

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index a2a27c2f..6c616b17 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b209c72c..7f407da3 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: 2009-08-07 11:21-0600\n"
+"PO-Revision-Date: 2009-08-09 18:42-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1261,7 +1261,7 @@ msgstr "mi perfil"
 
 #: templates/header.html:42
 msgid "ask a question"
-msgstr "hacer una pregunta"
+msgstr "preguntar"
 
 #: templates/header.html:57
 msgid "search"
-- 
cgit v1.2.3-1-g7c22


From 2d1e60db89453f2c12132d657551090c7ea92506 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Sun, 9 Aug 2009 23:52:33 -0300
Subject: Included i18n for links site-wide. Hope there is no bit left.

---
 locale/es/LC_MESSAGES/django.po | 196 +++++++++++++++++++++++++++++++++-------
 1 file changed, 164 insertions(+), 32 deletions(-)

(limited to 'locale')

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 <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 <span id=\"enter_your_what\">Provider user name</span>"
-msgstr ""
+msgstr "Ingresa tu <span id=\"enter_your_what\">nombre de usuario</span>"
 
 #: 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/"
-- 
cgit v1.2.3-1-g7c22


From 8fe45d961de797eae931656ec78edbb29eeadf02 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Mon, 10 Aug 2009 00:14:49 -0300
Subject: Translation.

---
 locale/es/LC_MESSAGES/django.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'locale')

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)"
-- 
cgit v1.2.3-1-g7c22


From 1eacc7a42618e84766477fbcc2c32a1da3547115 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Mon, 10 Aug 2009 21:40:01 -0400
Subject: untested commit. merged Adolfos mods, validated most of html, slugify
 urls, fixed IE issues in openid signin

---
 locale/en/LC_MESSAGES/django.po | 44 ++++++++++++++++++++---------------------
 locale/es/LC_MESSAGES/django.po |  4 ++--
 2 files changed, 23 insertions(+), 25 deletions(-)

(limited to 'locale')

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 3dda9ce9..07532566 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -148,7 +148,7 @@ msgstr ""
 
 #: django_authopenid/views.py:417 django_authopenid/views.py:544
 msgid "Welcome"
-msgstr "Verification Email from Q&A forum"
+msgstr "Verification Email from Q&amp;A forum"
 
 #: django_authopenid/views.py:507
 msgid "Password changed."
@@ -812,7 +812,7 @@ msgid "must have valid %(email)s to post"
 msgstr ""
 "<span class='strong big'>Looks like your email address, %(email)s has not "
 "yet been validated.</span> To post messages you must verify your email, "
-"please see <a href='/faq#validate'>more details here</a>.<br>You can submit "
+"please see <a href='/faq#validate'>more details here</a>.<br/>You can submit "
 "your question now and validate email after that. Your question will saved as "
 "pending meanwhile. "
 
@@ -1135,12 +1135,12 @@ msgstr ""
 "<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
 "\"bigger strong\">How?</span> If you have just set or changed your email "
 "address - <strong>check your email and click the included link</strong>."
-"<br>The link contains a key generated specifically for you. You can also "
+"<br/>The link contains a key generated specifically for you. You can also "
 "<button style='display:inline' type='submit'><strong>get a new key</strong></"
 "button> and check your email again.</p></form><span class=\"bigger strong"
 "\">Why?</span> Email validation is required to make sure that <strong>only "
 "you can post messages</strong> on your behalf and to <strong>minimize spam</"
-"strong> posts.<br>With email you can <strong>subscribe for updates</strong> "
+"strong> posts.<br/>With email you can <strong>subscribe for updates</strong> "
 "on the most interesting questions. Also, when you sign up for the first time "
 "- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
 "personal image.</p>"
@@ -1716,12 +1716,12 @@ msgid_plural ""
 "\t\t\t"
 msgstr[0] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>question tagged</p><p><span "
-"class=\"tag\">%(tagname)s</span></p>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>question tagged <span "
+"class=\"tag\">%(tagname)s</span>"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
-"class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged "
+"<span class=\"tag\">%(tagname)s</span>"
 
 #: templates/questions.html:116
 #, python-format
@@ -1735,14 +1735,12 @@ msgid_plural ""
 "\t\t\t\t"
 msgstr[0] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>question with title "
-"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
-"p>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>question with title "
+"containing <span class=\"darkred strong\">%(searchtitle)s</span>"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions with title "
-"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
-"p>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>questions with title "
+"containing <span class=\"darkred strong\">%(searchtitle)s</span></strong>"
 
 #: templates/questions.html:122
 #, python-format
@@ -1756,10 +1754,10 @@ msgid_plural ""
 "\t\t\t\t"
 msgstr[0] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>question</p>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>question"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>questions"
 
 #: templates/questions.html:131
 msgid "latest questions info"
@@ -1866,7 +1864,7 @@ msgstr ""
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
+"<span class=\"questions-count\">%(num_q)s</span><br/><strong>unanswered</strong> "
 "questions"
 
 #: templates/unanswered.html:99
@@ -2197,7 +2195,7 @@ msgstr "New user signup"
 #, python-format
 msgid "register new %(provider)s account info"
 msgstr ""
-"<p><span class=\"big strong\">You are here for the first time with your %"
+"<span class=\"big strong\">You are here for the first time with your %"
 "(provider)s login.</span> Please create your <strong>screen name</strong> "
 "and save your <strong>email</strong> address. Saved email address will let "
 "you <strong>subscribe for the updates</strong> on the most interesting "
@@ -2249,7 +2247,7 @@ msgstr ""
 
 #: templates/authopenid/confirm_email.txt:2
 msgid "Thank you for registering at our Q&A forum!"
-msgstr ""
+msgstr "Thank you for registering at our Q&amp;A forum!"
 
 #: templates/authopenid/confirm_email.txt:4
 msgid "Your account details are:"
@@ -2309,7 +2307,7 @@ msgstr ""
 
 #: templates/authopenid/email_validation.txt:2
 msgid "Greetings from the Q&A forum"
-msgstr ""
+msgstr "Greetings from the Q&amp;A forum"
 
 #: templates/authopenid/email_validation.txt:4
 msgid "To make use of the Forum, please follow the link below:"
@@ -2434,14 +2432,14 @@ msgid "Click to sign in through any of these services."
 msgstr ""
 "<p><span class=\"big strong\">We accept <a href=\"http://openid.net"
 "\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new "
-"password - log in through any of the services below.<p><span class=\"big "
+"password - log in through any of the services below.</font></p><p><span class=\"big "
 "strong\">1. Select the login service by clicking one of the icons</span></p>"
 
 #: templates/authopenid/signin.html:103
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
 msgstr ""
 "<span class=\"big strong\">2. Enter your <span id=\"enter_your_what"
-"\">Provider user name</span></span><br>(or select another OpenID provider "
+"\">Provider user name</span></span><br/>(or select another OpenID provider "
 "above)"
 
 #: templates/authopenid/signin.html:110
@@ -2450,7 +2448,7 @@ msgid ""
 "web address"
 msgstr ""
 "<span class=\"big strong\">2. Enter your <a class=\"openid_logo\" href="
-"\"http://openid.net\">OpenID</a> web address</span><br>(or choose specific "
+"\"http://openid.net\">OpenID</a> web address</span><br/>(or choose specific "
 "provider by clicking on one of the icons above)"
 
 #: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 7f407da3..b209c72c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: 2009-08-09 18:42-0600\n"
+"PO-Revision-Date: 2009-08-07 11:21-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1261,7 +1261,7 @@ msgstr "mi perfil"
 
 #: templates/header.html:42
 msgid "ask a question"
-msgstr "preguntar"
+msgstr "hacer una pregunta"
 
 #: templates/header.html:57
 msgid "search"
-- 
cgit v1.2.3-1-g7c22


From dad43ef25f1516581f1a19135fa0c594997e45fc Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Tue, 11 Aug 2009 04:17:00 -0300
Subject: FAQ translation for Preguntalo.com.uy

---
 locale/es/LC_MESSAGES/django.po | 608 ++++++++++++++++++++++++----------------
 1 file changed, 359 insertions(+), 249 deletions(-)

(limited to 'locale')

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 <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 ""
+"<span class='strong big'>Puedes comenzar a realizar tu pregunta de forma "
+"anonima</span> - 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 ""
+"<span class='strong big'>Parece ser que tu dirección de email, %(email)s no "
+"ha sido validada aún.</span> Para enviar mensajes debes verificar tu "
+"dirección de email, puedes ver <a href='/faq#validate'>más detalles aquí</"
+"a>. <br/> 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 <strong>10</strong> "
+"points, each vote against will subtract <strong>2</strong> points. There is "
+"a limit of <strong>200</strong> 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 <strong>10"
+"</strong> puntos, cada voto en contra restará <strong>2</strong> puntos. Hay "
+"un limite de <strong>200</strong> 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 ""
+"<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
+"\"bigger strong\">¿Cómo?</span> Si acabas de asignar o cambiar tu correo "
+"electrónico - <strong>verifica tu casilla de mensajes y clickea en el link "
+"incluido</strong>. <br/> El link contiene una clave generada especificamente "
+"para ti. <button style='display:inline' type='submit'><strong>get a new key</"
+"strong></button> y vuelve a revisar tu casilla de mensajes.</p></form><span "
+"class=\"bigger strong\">¿Porqué?</span> La validación del email es requerida "
+"para estar seguros the que <strong>solo tu puedes enviar mensajes</strong> "
+"bajo tu concentimiento y para <strong>minimizar el spam</strong>.<br/> Con "
+"tu email podrás <strong>suscribirte a actualizaciones</strong> en las "
+"preguntas mas interesantes. También, cuando te registras por primera vez - "
+"se crea un imagen personal única de <a href='/"
+"faq#gravatar'><strong>gravatar</strong></a>."
 
-#: 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 ""
+"<strong>Gravatar</strong> significa <strong>g</strong>lobalmente <strong>r</"
+"strong>econocido <strong>avatar</strong> - 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 <strong>seleccionar "
+"tu imagen</strong> en <a href='http://gravatar.com'><strong>gravatar.com</"
+"strong></a>"
+
+#: 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 <strong>número de votos</strong>."
 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 ""
 "<div class=\"questions-count\">%(num_q)s</div> preguntas <strong>sin "
 "respuesta</strong> "
 
-#: 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 <a class=\"openid_logo\" href=\"http://openid."
 "net\">OpenID</a>"
 
-#: 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/"
 
-- 
cgit v1.2.3-1-g7c22


From 3bf18ad5c7616379038ad301e7d92b9620159c57 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
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.

---
 locale/es/LC_MESSAGES/django.po | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'locale')

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 <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 <strong>10"
-"</strong> puntos, cada voto en contra restará <strong>2</strong> puntos. Hay "
+"de lugar - será votada negativamente. Cada voto a favor genera <strong>10</"
+"strong> puntos, cada voto en contra restará <strong>2</strong> puntos. Hay "
 "un limite de <strong>200</strong> puntos que puedes acumular por pregunta o "
 "respuesta. La tabla debajo explica los puntos de reputación requeridos para "
 "cada tarea de moderación."
-- 
cgit v1.2.3-1-g7c22


From 3b3b19e16e9a040275d9dc157c3a87ba6adf215e Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Wed, 12 Aug 2009 10:35:51 -0600
Subject: updating some missing translations

---
 locale/es/LC_MESSAGES/django.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'locale')

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b209c72c..256387dc 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: 2009-08-07 11:21-0600\n"
+"PO-Revision-Date: 2009-08-12 10:35-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1606,11 +1606,11 @@ msgstr "Responde la pregunta"
 
 #: templates/question.html:467
 msgid "Notify me daily if there are any new answers."
-msgstr ""
+msgstr "Notifiquema diariamente si hay nuevas respuestas"
 
 #: templates/question.html:469
 msgid "once you sign in you will be able to subscribe for any updates here"
-msgstr ""
+msgstr "Una vez que inicie sesión se podrá suscribir a cualquier actualización aquí"
 
 #: templates/question.html:481
 msgid "Question tags"
@@ -1671,7 +1671,7 @@ msgstr "¿Porqué usar y modificar etiquetas?"
 
 #: templates/question_retag.html:89
 msgid "tags help us keep Questions organized"
-msgstr ""
+msgstr "las etiquetas nos ayudan a mantener las preguntar organizadas"
 
 #: templates/question_retag.html:95
 msgid "tag editors receive special awards from the community"
-- 
cgit v1.2.3-1-g7c22


From 1453809f46d760c42c485587d04072d38ea0b2b2 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Wed, 12 Aug 2009 10:35:51 -0600
Subject: updating some missing translations

---
 locale/en/LC_MESSAGES/django.mo | Bin 13992 -> 14218 bytes
 locale/es/LC_MESSAGES/django.mo | Bin 42834 -> 43234 bytes
 locale/es/LC_MESSAGES/django.po |   8 ++++----
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'locale')

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 11d15deb..d7523d09 100644
Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 6c616b17..c8b8b5ee 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b209c72c..4eb3757e 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-05 22:28-0400\n"
-"PO-Revision-Date: 2009-08-07 11:21-0600\n"
+"PO-Revision-Date: 2009-08-12 11:00-0600\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1606,11 +1606,11 @@ msgstr "Responde la pregunta"
 
 #: templates/question.html:467
 msgid "Notify me daily if there are any new answers."
-msgstr ""
+msgstr "Notificarme diariamente si hay nuevas respuestas"
 
 #: templates/question.html:469
 msgid "once you sign in you will be able to subscribe for any updates here"
-msgstr ""
+msgstr "Una vez que inicie sesión se podrá suscribir a cualquier actualización aquí"
 
 #: templates/question.html:481
 msgid "Question tags"
@@ -1671,7 +1671,7 @@ msgstr "¿Porqué usar y modificar etiquetas?"
 
 #: templates/question_retag.html:89
 msgid "tags help us keep Questions organized"
-msgstr ""
+msgstr "las etiquetas nos ayudan a mantener las preguntar organizadas"
 
 #: templates/question_retag.html:95
 msgid "tag editors receive special awards from the community"
-- 
cgit v1.2.3-1-g7c22


From 5c6fceae98c0916c94ec5b919950c67475f44b67 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
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

---
 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 +++++++++----------
 4 files changed, 505 insertions(+), 382 deletions(-)
 create mode 100644 locale/es/LC_MESSAGES/django.mo

(limited to 'locale')

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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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&amp;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 <a "
 "id='validate_email_alert' href=\"/faq#validate\">here</a>."
 
-#: 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 <a href='/faq#validate'>more details here</a>"
 
-#: 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></strong> - 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 <strong>10</strong> "
+"points, each vote against will subtract <strong>2</strong> points. There is "
+"a limit of <strong>200</strong> 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 ""
 "<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
 "\"bigger strong\">How?</span> If you have just set or changed your email "
-"address - <strong>check your email and click the included link</strong>."
-"<br/>The link contains a key generated specifically for you. You can also "
+"address - <strong>check your email and click the included link</strong>.<br/"
+">The link contains a key generated specifically for you. You can also "
 "<button style='display:inline' type='submit'><strong>get a new key</strong></"
 "button> and check your email again.</p></form><span class=\"bigger strong"
 "\">Why?</span> Email validation is required to make sure that <strong>only "
@@ -1145,11 +1276,11 @@ msgstr ""
 "- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
 "personal image.</p>"
 
-#: templates/faq.html:112
+#: templates/faq.html:106
 msgid "what is gravatar"
 msgstr "What is gravatar?"
 
-#: templates/faq.html:113
+#: templates/faq.html:107
 msgid "gravatar faq info"
 msgstr ""
 "<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</"
@@ -1160,54 +1291,54 @@ msgstr ""
 "your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</"
 "strong></a>"
 
-#: templates/faq.html:116
+#: templates/faq.html:110
 msgid "To register, do I need to create new password?"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: templates/faq.html:118
+#: templates/faq.html:112
 msgid "Login now!"
 msgstr ""
 
-#: templates/faq.html:123
+#: templates/faq.html:117
 msgid "Why other people can edit my questions/answers?"
 msgstr ""
 
-#: templates/faq.html:124
+#: templates/faq.html:118
 msgid "Goal of this site is..."
 msgstr ""
 
-#: 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 "
 "content."
 msgstr ""
 
-#: templates/faq.html:125
+#: templates/faq.html:119
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 
-#: templates/faq.html:129
+#: templates/faq.html:123
 msgid "Still have questions?"
 msgstr ""
 
-#: templates/faq.html:130
+#: templates/faq.html:124
 msgid "Please ask your question, help make our community better!"
 msgstr ""
 "Please <a href=\"/questions/ask\">ask</a> your question, help make our "
 "community better!"
 
-#: templates/faq.html:132 templates/header.html:29 templates/header.html.py:60
+#: templates/faq.html:126 templates/header.html:29 templates/header.html.py:63
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:132 templates/index.html:121
+#: templates/faq.html:126 templates/index.html:123
 msgid "."
 msgstr ""
 
@@ -1216,6 +1347,7 @@ msgid "about"
 msgstr ""
 
 #: templates/footer.html:8 templates/header.html:15 templates/index.html:84
+#: templates/question_edit_tips.html:16
 msgid "faq"
 msgstr ""
 
@@ -1251,27 +1383,27 @@ msgstr ""
 msgid "back to home page"
 msgstr ""
 
-#: templates/header.html:31 templates/header.html.py:62
+#: templates/header.html:31 templates/header.html.py:65
 msgid "users"
 msgstr ""
 
-#: templates/header.html:32
+#: templates/header.html:33
 msgid "books"
 msgstr ""
 
-#: templates/header.html:34
+#: templates/header.html:36
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:38
+#: templates/header.html:40
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:42
+#: templates/header.html:44
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:57
+#: templates/header.html:59
 msgid "search"
 msgstr ""
 
@@ -1317,11 +1449,10 @@ msgstr ""
 msgid "answers"
 msgstr ""
 
-#: 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/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 "see questions tagged"
 msgstr ""
 
@@ -1333,48 +1464,48 @@ msgstr ""
 msgid "Recent tags"
 msgstr ""
 
-#: templates/index.html:94
+#: templates/index.html:94 templates/question.html:125
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
-#: templates/index.html:97 templates/index.html.py:121
+#: templates/index.html:97 templates/index.html.py:123
 msgid "popular tags"
 msgstr "tags"
 
-#: templates/index.html:101
+#: templates/index.html:102
 msgid "Recent awards"
 msgstr "Recent badges"
 
-#: templates/index.html:107
+#: templates/index.html:108
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:112
+#: templates/index.html:113
 msgid "all awards"
 msgstr "all badges"
 
-#: templates/index.html:116
+#: templates/index.html:118
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "complete list of questions"
 msgstr "list of all questions"
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "or"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "Please help us answer"
 msgstr ""
 
-#: templates/index.html:121
+#: templates/index.html:123
 msgid "list of unanswered questions"
 msgstr "unanswered questions"
 
@@ -1460,187 +1591,189 @@ msgstr ""
 msgid "how privacy policies can be changed"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: templates/question.html:93
+#: templates/question.html:100 templates/question.html.py:101
 msgid "mark this question as favorite (click again to cancel)"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: templates/question.html:128 templates/question.html.py:317
+#: templates/question.html:138 templates/question.html.py:332
 msgid "delete"
 msgstr ""
 
-#: templates/question.html:133
+#: templates/question.html:143
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:138
+#: templates/question.html:148
 msgid "close"
 msgstr ""
 
-#: 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 ""
 
-#: templates/question.html:145 templates/question.html.py:331
+#: templates/question.html:155 templates/question.html.py:346
 msgid "flag offensive"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: templates/question.html:236 templates/question.html.py:414
+#: templates/question.html:246 templates/question.html.py:429
 msgid "comments"
 msgstr ""
 
-#: templates/question.html:237 templates/question.html.py:415
+#: templates/question.html:247 templates/question.html.py:430
 msgid "add comment"
 msgstr ""
 
-#: templates/question.html:250
+#: templates/question.html:260
 #, python-format
 msgid ""
 "The question has been closed for the following reason \"%(question."
 "get_close_reason_display)s\" by"
 msgstr ""
 
-#: templates/question.html:252
+#: templates/question.html:262
 #, python-format
 msgid "close date %(question.closed_at)s"
 msgstr ""
 
-#: templates/question.html:259 templates/user_stats.html:28
+#: templates/question.html:269 templates/user_stats.html:28
 msgid "Answers"
 msgstr " Answers"
 
-#: templates/question.html:261
+#: templates/question.html:271
 msgid "oldest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:261
+#: templates/question.html:271
 msgid "oldest answers"
 msgstr "oldest"
 
-#: templates/question.html:262
+#: templates/question.html:272
 msgid "newest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:262
+#: templates/question.html:272
 msgid "newest answers"
 msgstr "newest"
 
-#: templates/question.html:263
+#: templates/question.html:273
 msgid "most voted answers will be shown first"
 msgstr ""
 
-#: templates/question.html:263
+#: templates/question.html:273
 msgid "popular answers"
 msgstr "most voted"
 
-#: templates/question.html:275
+#: templates/question.html:287 templates/question.html.py:288
 msgid "i like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:281
+#: templates/question.html:294 templates/question.html.py:295
 msgid "i dont like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:287
+#: templates/question.html:300 templates/question.html.py:301
 msgid "mark this answer as favorite (click again to undo)"
 msgstr ""
 
-#: 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 ""
 
-#: templates/question.html:314
+#: templates/question.html:329
 msgid "undelete"
 msgstr ""
 
-#: templates/question.html:324
+#: templates/question.html:339
 msgid "answer permanent link"
 msgstr ""
 
-#: templates/question.html:325
+#: templates/question.html:340
 msgid "permanent link"
 msgstr ""
 
-#: templates/question.html:438
+#: templates/question.html:453
 msgid "Your answer"
 msgstr ""
 
-#: templates/question.html:441
+#: templates/question.html:456
 msgid "you can answer anonymously and then login"
 msgstr ""
 "<span class='strong big'>You are now not logged in</span> but you can answer "
 "first and then login"
 
-#: templates/question.html:465
+#: templates/question.html:479
 msgid "Answer the question"
 msgstr ""
 
-#: templates/question.html:467
+#: templates/question.html:481
 msgid "Notify me daily if there are any new answers."
 msgstr ""
 
-#: templates/question.html:469
+#: templates/question.html:483
 msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr "Here logged in users can sign up for the question updates."
 
-#: templates/question.html:481
+#: templates/question.html:494
 msgid "Question tags"
 msgstr "Tags"
 
-#: templates/question.html:491
+#: templates/question.html:504
 msgid "question asked"
 msgstr "Asked"
 
-#: templates/question.html:491 templates/question.html.py:497
+#: templates/question.html:504 templates/question.html.py:510
 #: templates/user_info.html:51
 msgid "ago"
 msgstr ""
 
-#: templates/question.html:494
+#: templates/question.html:507
 msgid "question was seen"
 msgstr "Seen"
 
-#: templates/question.html:494
+#: templates/question.html:507
 msgid "times"
 msgstr ""
 
-#: templates/question.html:497
+#: templates/question.html:510
 msgid "last updated"
 msgstr "Last updated"
 
-#: templates/question.html:502
+#: templates/question.html:515
 msgid "Related questions"
 msgstr ""
 
@@ -1668,15 +1801,15 @@ msgstr ""
 msgid "up to 5 tags, less than 20 characters each"
 msgstr ""
 
-#: templates/question_retag.html:86
+#: templates/question_retag.html:82
 msgid "Why use and modify tags?"
 msgstr ""
 
-#: templates/question_retag.html:89
+#: templates/question_retag.html:85
 msgid "tags help us keep Questions organized"
 msgstr ""
 
-#: templates/question_retag.html:95
+#: templates/question_retag.html:91
 msgid "tag editors receive special awards from the community"
 msgstr ""
 
@@ -1720,8 +1853,8 @@ msgstr[0] ""
 "class=\"tag\">%(tagname)s</span>"
 msgstr[1] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged "
-"<span class=\"tag\">%(tagname)s</span>"
+"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged <span "
+"class=\"tag\">%(tagname)s</span>"
 
 #: templates/questions.html:116
 #, python-format
@@ -1787,7 +1920,7 @@ msgstr ""
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:153 templates/unanswered.html:105
+#: templates/questions.html:153 templates/unanswered.html:102
 msgid "Related tags"
 msgstr "Tags"
 
@@ -1824,35 +1957,35 @@ msgstr ""
 msgid "Revision history"
 msgstr ""
 
-#: templates/tags.html:6 templates/tags.html.py:29
+#: templates/tags.html:6 templates/tags.html.py:30
 msgid "Tag list"
 msgstr ""
 
-#: templates/tags.html:31
+#: templates/tags.html:32
 msgid "sorted alphabetically"
 msgstr ""
 
-#: templates/tags.html:31
+#: templates/tags.html:32
 msgid "by name"
 msgstr ""
 
-#: templates/tags.html:32
+#: templates/tags.html:33
 msgid "sorted by frequency of tag use"
 msgstr ""
 
-#: templates/tags.html:32
+#: templates/tags.html:33
 msgid "by popularity"
 msgstr ""
 
-#: templates/tags.html:38
+#: templates/tags.html:39
 msgid "All tags matching query"
 msgstr ""
 
-#: templates/tags.html:38
+#: templates/tags.html:39
 msgid "all tags - make this empty in english"
 msgstr ""
 
-#: templates/tags.html:41
+#: templates/tags.html:42
 msgid "Nothing found"
 msgstr ""
 
@@ -1864,12 +1997,8 @@ msgstr ""
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<span class=\"questions-count\">%(num_q)s</span><br/><strong>unanswered</strong> "
-"questions"
-
-#: templates/unanswered.html:99
-msgid "Have a total of"
-msgstr ""
+"<span class=\"questions-count\">%(num_q)s</span><br/> questions with "
+"<strong>no accepted answers</strong>"
 
 #: templates/user_edit.html:6
 msgid "Edit user profile"
@@ -1939,61 +2068,61 @@ msgstr ""
 msgid "Connect with Twitter"
 msgstr ""
 
-#: templates/user_preferences.html:12
+#: templates/user_preferences.html:13
 msgid "Twitter account name:"
 msgstr ""
 
-#: templates/user_preferences.html:14
+#: templates/user_preferences.html:15
 msgid "Twitter password:"
 msgstr ""
 
-#: templates/user_preferences.html:16
+#: templates/user_preferences.html:17
 msgid "Send my Questions to Twitter"
 msgstr ""
 
-#: templates/user_preferences.html:17
+#: templates/user_preferences.html:18
 msgid "Send my Answers to Twitter"
 msgstr ""
 
-#: templates/user_preferences.html:18
+#: templates/user_preferences.html:19
 msgid "Save"
 msgstr ""
 
-#: templates/user_stats.html:15
+#: templates/user_stats.html:16
 msgid "User questions"
 msgstr ""
 
-#: templates/user_stats.html:37
+#: templates/user_stats.html:38
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:37
+#: templates/user_stats.html:38
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:43
+#: templates/user_stats.html:46
 #, python-format
-msgid "the answer has been commented %(answered_question.comment_count)s times"
-msgstr ""
+msgid "the answer has been commented %(comment_count)s times"
+msgstr "(%(comment_count)s comment(s))"
 
-#: templates/user_stats.html:56
+#: templates/user_stats.html:60
 msgid "votes total"
 msgstr "Votes"
 
-#: templates/user_stats.html:65
+#: templates/user_stats.html:69
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:70
+#: templates/user_stats.html:74
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:84
+#: templates/user_stats.html:87
 msgid "Tags"
 msgstr ""
 
-#: templates/user_stats.html:94
+#: templates/user_stats.html:97
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
@@ -2078,7 +2207,7 @@ msgstr ""
 "anyone, must be valid)"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:138
+#: templates/authopenid/signin.html:136
 msgid "Password"
 msgstr ""
 
@@ -2207,7 +2336,7 @@ msgid "This account already exists, please use another."
 msgstr ""
 
 #: 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 ""
 
@@ -2241,7 +2370,7 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: 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 ""
 
@@ -2432,8 +2561,9 @@ msgid "Click to sign in through any of these services."
 msgstr ""
 "<p><span class=\"big strong\">We accept <a href=\"http://openid.net"
 "\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new "
-"password - log in through any of the services below.</font></p><p><span class=\"big "
-"strong\">1. Select the login service by clicking one of the icons</span></p>"
+"password - log in through any of the services below.</font></p><p><span "
+"class=\"big strong\">1. Select the login service by clicking one of the "
+"icons</span></p>"
 
 #: templates/authopenid/signin.html:103
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
@@ -2451,7 +2581,7 @@ msgstr ""
 "\"http://openid.net\">OpenID</a> web address</span><br/>(or choose specific "
 "provider by clicking on one of the icons above)"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:139
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
 msgid "Login"
 msgstr ""
 
@@ -2461,45 +2591,45 @@ msgstr ""
 "You can log in either through one of these services or traditionally - using "
 "local username/password."
 
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:134
 msgid "Use login name and password"
 msgstr ""
 
-#: templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:135
 msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:141
+#: templates/authopenid/signin.html:139
 msgid "Create new account"
 msgstr ""
 
-#: templates/authopenid/signin.html:150
+#: templates/authopenid/signin.html:148
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:154
+#: templates/authopenid/signin.html:151
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:157
+#: templates/authopenid/signin.html:154
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:160
+#: templates/authopenid/signin.html:157
 msgid "openid is widely adopted"
 msgstr ""
 "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
 "enabled."
 
-#: templates/authopenid/signin.html:163
+#: templates/authopenid/signin.html:160
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:167
+#: templates/authopenid/signin.html:165
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:168
+#: templates/authopenid/signin.html:166
 msgid "Get OpenID"
 msgstr ""
 
@@ -2533,11 +2663,11 @@ msgstr ""
 msgid "back to login"
 msgstr ""
 
-#: templates/authopenid/signup.html:48
+#: templates/authopenid/signup.html:46
 msgid "Register with your OpenID"
 msgstr ""
 
-#: templates/authopenid/signup.html:51
+#: templates/authopenid/signup.html:49
 msgid "Login with your OpenID"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 00000000..fc7ebe14
Binary files /dev/null and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 16ccc51a..b528fcf2 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 15:39-0300\n"
+"POT-Creation-Date: 2009-08-12 15:53+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,7 @@ 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:699
+#: templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -57,7 +58,7 @@ msgstr "códigodeprivacidad/"
 msgid "logout/"
 msgstr "cerrarsesion/"
 
-#: urls.py:34 urls.py:35 urls.py:36 urls.py:48
+#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
 msgid "answers/"
 msgstr "respuestas/"
 
@@ -75,7 +76,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:1416
+#: forum/models.py:306 forum/views.py:1416
 msgid "questions/"
 msgstr "preguntas/"
 
@@ -268,9 +269,8 @@ msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
 #: django_authopenid/urls.py:27
-#, fuzzy
 msgid "validate/"
-msgstr "Cambiar dirección email"
+msgstr ""
 
 #: django_authopenid/views.py:108
 #, python-format
@@ -383,9 +383,6 @@ 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"
 
@@ -495,7 +492,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:63
+#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:64
 msgid "tags"
 msgstr "etiquetas"
 
@@ -530,7 +527,6 @@ msgstr ""
 #: templates/question.html.py:395 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
 #: templates/unanswered.html.py:60
-#, fuzzy
 msgid "community wiki"
 msgstr "wiki de comunidad"
 
@@ -587,9 +583,8 @@ 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:246
-#, fuzzy, python-format
 msgid "%(author)s modified the question"
-msgstr "%(author) modificó la pregunta"
+msgstr "%(author)s modificó la pregunta"
 
 #: forum/models.py:250
 #, python-format
@@ -607,10 +602,14 @@ msgid "%(people)s commented answers"
 msgstr "%(people)s comentaron la respuesta"
 
 #: forum/models.py:262
-#, fuzzy, python-format
+#, python-format
 msgid "%(people)s commented an answer"
 msgstr "%(people)s comentaron la respuesta"
 
+#: forum/models.py:306 forum/models.py:418
+msgid "revisions"
+msgstr "revisiones/"
+
 #: forum/models.py:441 templates/badges.html:51
 msgid "gold"
 msgstr "oro"
@@ -739,7 +738,7 @@ msgid "updates from website"
 msgstr "actualizaciones del sitio"
 
 #: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
-#: templates/header.html:37
+#: templates/header.html:35
 msgid "badges"
 msgstr "distinciones"
 
@@ -893,7 +892,6 @@ 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"
 
@@ -982,7 +980,7 @@ msgstr "Usuarios han sido galardonados con distinciones:"
 msgid "Badges summary"
 msgstr "Resumen de distinciones"
 
-#: templates/badges.html:17 templates/user_stats.html:114
+#: templates/badges.html:17 templates/user_stats.html:115
 msgid "Badges"
 msgstr "Distinciones"
 
@@ -1026,152 +1024,98 @@ 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.BASE.30295.html:7
-#: templates/book.html.LOCAL.30295.html:7
-#: templates/book.html.REMOTE.30295.html:7
+#: templates/book.html:7
 msgid "reading channel"
 msgstr "canal de lectura"
 
-#: 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
+#: templates/book.html:26
 msgid "[author]"
 msgstr "[autor]"
 
-#: 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
+#: templates/book.html:30
 msgid "[publisher]"
 msgstr "[editorial]"
 
-#: 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
+#: templates/book.html:34
 msgid "[publication date]"
 msgstr "[fecha de publicación]"
 
-#: 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
+#: templates/book.html:38
 msgid "[price]"
 msgstr "[precio]"
 
-#: 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
+#: templates/book.html:39
 msgid "currency unit"
 msgstr "unidad de moneda"
 
-#: 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
+#: templates/book.html:42
 msgid "[pages]"
 msgstr "[páginas]"
 
-#: 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
+#: templates/book.html:43
 msgid "pages abbreviation"
 msgstr "abreviación de páginas"
 
-#: 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
+#: templates/book.html:46
 msgid "[tags]"
 msgstr "[etiquetas]"
 
-#: 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
+#: templates/book.html:56
 msgid "author blog"
 msgstr "blog del autor"
 
-#: 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
+#: templates/book.html:62
 msgid "book directory"
 msgstr "directorio del libro"
 
-#: 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
+#: templates/book.html:66
 msgid "buy online"
 msgstr "comprar en-linea"
 
-#: 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
+#: templates/book.html:79
 msgid "reader questions"
 msgstr "pregunta de lector"
 
-#: 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
+#: templates/book.html:82
 msgid "ask the author"
 msgstr "preguntar al autor"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: 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
+#: 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/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
+#: templates/users_questions.html:11 templates/users_questions.html.py:17
 msgid "number of times"
 msgstr "numero de veces"
 
-#: 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
+#: templates/book.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.BASE.30295.html:108
-#: templates/book.html.LOCAL.30295.html:108
-#: templates/book.html.REMOTE.30295.html:108
+#: templates/book.html:108
 msgid "the answer has been accepted to be correct"
 msgstr "la respuesta ha sido aceptada como correcta"
 
-#: 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
+#: templates/book.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/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/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 "usando etiquetas"
 
-#: 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/book.html:147
 msgid "subscribe to book RSS feed"
 msgstr "suscribirse al RSS del libro"
 
-#: 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
+#: templates/book.html:147 templates/index.html:118
 msgid "subscribe to the questions feed"
 msgstr "suscribirse al agregado de noticias"
 
@@ -1231,10 +1175,6 @@ msgstr ""
 msgid "What should I avoid in my answers?"
 msgstr "¿Que debo evitar en mis respuestas?"
 
-#: templates/faq.html:28 templates/faq.html.py:126
-msgid "site title"
-msgstr "Preguntalo.com.uy"
-
 #: templates/faq.html:28
 msgid ""
 "is a Q&A site, not a discussion group. Therefore - please avoid having "
@@ -1427,7 +1367,7 @@ msgstr "¿Aún tienes preguntas?"
 msgid "Please ask your question, help make our community better!"
 msgstr "Por favor haz tu pregunta, ¡ayudanos a mejorar nuestra comunidad!"
 
-#: templates/faq.html:126 templates/header.html:33 templates/header.html.py:62
+#: templates/faq.html:126 templates/header.html:29 templates/header.html.py:63
 msgid "questions"
 msgstr "preguntas"
 
@@ -1476,29 +1416,27 @@ msgstr "entrar"
 msgid "back to home page"
 msgstr "volver página principal"
 
-#: templates/header.html:30
-msgid "ask a question"
-msgstr "hacer una pregunta"
-
-#: templates/header.html:35 templates/header.html.py:64
+#: templates/header.html:31 templates/header.html.py:65
 msgid "users"
 msgstr "usuarios"
 
-#: templates/header.html:36
-#, fuzzy
+#: templates/header.html:33
 msgid "books"
 msgstr "libros"
 
-#: templates/header.html:38
+#: templates/header.html:36
 msgid "unanswered questions"
 msgstr "sin respuesta"
 
-#: templates/header.html:42
+#: templates/header.html:40
 msgid "my profile"
 msgstr "mi perfil"
 
-#: templates/header.html:58
-#, fuzzy
+#: templates/header.html:44
+msgid "ask a question"
+msgstr "hacer una pregunta"
+
+#: templates/header.html:59
 msgid "search"
 msgstr "buscar"
 
@@ -1511,7 +1449,6 @@ msgid "Questions"
 msgstr "Preguntas"
 
 #: templates/index.html:24
-#, fuzzy
 msgid "last updated questions"
 msgstr "ultimas preguntas actualizadas"
 
@@ -1545,11 +1482,10 @@ msgstr "todas las preguntas"
 msgid "answers"
 msgstr "respuestas"
 
-#: 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
+#: 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 "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
@@ -1561,7 +1497,7 @@ msgstr "bienvenido a sitio"
 msgid "Recent tags"
 msgstr "Etiquetas recientes"
 
-#: templates/index.html:94
+#: templates/index.html:94 templates/question.html:125
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr "ver preguntas etiquetadas '%(tagname)s'"
@@ -1595,7 +1531,6 @@ msgid "complete list of questions"
 msgstr "lista completa de preguntas"
 
 #: templates/index.html:123
-#, fuzzy
 msgid "or"
 msgstr "ó"
 
@@ -1648,7 +1583,6 @@ msgid "next page"
 msgstr "próxima página"
 
 #: templates/privacy.html:6 templates/privacy.html.py:11
-#, fuzzy
 msgid "Privacy policy"
 msgstr "Privacidad"
 
@@ -1657,7 +1591,6 @@ msgid "general message about privacy"
 msgstr "mensaje de privacidad"
 
 #: templates/privacy.html:18
-#, fuzzy
 msgid "Site Visitors"
 msgstr "Visitantes del Sitio"
 
@@ -1777,7 +1710,7 @@ msgstr ""
 msgid "close date %(question.closed_at)s"
 msgstr "fecha de cerrada %(question.closed_at)s"
 
-#: templates/question.html:269 templates/user_stats.html:29
+#: templates/question.html:269 templates/user_stats.html:28
 msgid "Answers"
 msgstr "Respuestas"
 
@@ -1856,7 +1789,6 @@ msgstr ""
 "actualizaciones aquí."
 
 #: templates/question.html:494
-#, fuzzy
 msgid "Question tags"
 msgstr "Tags de la pregunta"
 
@@ -1866,7 +1798,6 @@ msgstr "pregunta preguntada"
 
 #: templates/question.html:504 templates/question.html.py:510
 #: templates/user_info.html:51
-#, fuzzy
 msgid "ago"
 msgstr " atras"
 
@@ -1967,7 +1898,7 @@ msgstr[1] ""
 "\t\t\t"
 
 #: templates/questions.html:116
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "\n"
 "\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
@@ -2061,7 +1992,6 @@ 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 "Historial de revisiones"
 
@@ -2109,7 +2039,6 @@ msgstr ""
 "respuesta</strong> "
 
 #: templates/user_edit.html:6
-#, fuzzy
 msgid "Edit user profile"
 msgstr "Editar perfil de usuario"
 
@@ -2134,7 +2063,6 @@ msgid "Update"
 msgstr "Actualización"
 
 #: templates/user_info.html:34
-#, fuzzy
 msgid "update profile"
 msgstr "actualizar perfil de usuario"
 
@@ -2211,35 +2139,33 @@ msgstr "la respuesta ha sido votada %(vote_count)s veces"
 msgid "this answer has been selected as correct"
 msgstr "esta respuesta ha sido seleccionada como correcta"
 
-#: templates/user_stats.html:44
-#, fuzzy, python-format
+#: templates/user_stats.html:46
+#, python-format
 msgid "the answer has been commented %(comment_count)s times"
-msgstr ""
-"la respuesta ha sido comentada %(answered_question.comment_count)s veces"
+msgstr "la respuesta ha sido comentada %(comment_count)s veces"
 
-#: templates/user_stats.html:57
+#: templates/user_stats.html:60
 msgid "votes total"
 msgstr "votos totales"
 
-#: templates/user_stats.html:66
+#: templates/user_stats.html:69
 msgid "user has voted up this many times"
 msgstr "el usuario ha votado positivo esta cantidad de veces"
 
-#: templates/user_stats.html:71
+#: templates/user_stats.html:74
 msgid "user voted down this many times"
 msgstr "el usuario voto negativo esta cantidad de veces"
 
-#: templates/user_stats.html:85
+#: templates/user_stats.html:87
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/user_stats.html:95
+#: templates/user_stats.html:97
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr "ver otras preguntas etiqueteadas '%(tag)s'"
 
 #: templates/user_tabs.html:7
-#, fuzzy
 msgid "User profile"
 msgstr "Perfil de usuario"
 
@@ -2252,7 +2178,6 @@ msgid "reputation history"
 msgstr "historial de reputación"
 
 #: templates/user_tabs.html:24
-#, fuzzy
 msgid "favorites"
 msgstr "favoritos"
 
@@ -2299,9 +2224,9 @@ msgid "Change email"
 msgstr "Cambiar dirección email"
 
 #: templates/authopenid/changeemail.html:10
-#, fuzzy, python-format
+#, python-format
 msgid "change %(email)s info"
-msgstr "Cambiar información del correo electrónico "
+msgstr "Cambiar información del correo electrónico %(email)s"
 
 #: templates/authopenid/changeemail.html:13
 #: templates/authopenid/changeopenid.html:14
@@ -2459,6 +2384,36 @@ msgstr "Registrarse"
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
+#: templates/authopenid/confirm_email.txt:2
+msgid "Thank you for registering at our Q&A forum!"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:4
+msgid "Your account details are:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:6
+#: templates/authopenid/sendpw_email.txt:7
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: templates/authopenid/confirm_email.txt:7
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr "Contraseña"
+
+#: templates/authopenid/confirm_email.txt:9
+msgid "Please sign in here:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:12
+#: templates/authopenid/email_validation.txt:14
+#: templates/authopenid/sendpw_email.txt:13
+msgid ""
+"Sincerely,\n"
+"Forum Administrator"
+msgstr ""
+
 #: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr "Cuenta: borrar cuenta"
@@ -2475,10 +2430,6 @@ msgstr ""
 msgid "Check confirm box, if you want delete your account."
 msgstr "Marca caja de confirmación, si deseas borrar tu cuenta."
 
-#: templates/authopenid/delete.html:20
-msgid "Password:"
-msgstr "Contraseña"
-
 #: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr "Estoy seguro que quiero borrar mi cuenta."
@@ -2495,6 +2446,25 @@ msgstr "(requerido por tu seguridad)"
 msgid "Delete account permanently"
 msgstr "Borrar la cuenta de forma permanente"
 
+#: templates/authopenid/email_validation.txt:2
+msgid "Greetings from the Q&A forum"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:4
+msgid "To make use of the Forum, please follow the link below:"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:8
+msgid "Following the link above will help us verify your email address."
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:10
+msgid ""
+"If you beleive that this message was sent in mistake - \n"
+"no further action is needed. Just ingore this email, we apologize\n"
+"for any inconvenience"
+msgstr ""
+
 #: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr "Enviar nueva contraseña"
@@ -2531,6 +2501,26 @@ 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/sendpw_email.txt:2
+#, python-format
+msgid ""
+"Someone has requested to reset your password on %(site_url)s.\n"
+"If it were not you, it is safe to ignore this email."
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:5
+msgid "Your new account details are:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:8
+#, fuzzy
+msgid "New password:"
+msgstr "Nueva contraseña:"
+
+#: templates/authopenid/sendpw_email.txt:10
+msgid "To confirm that you wanted to reset your password please visit:"
+msgstr ""
+
 #: templates/authopenid/settings.html:30
 msgid "Give your  account a new password."
 msgstr "Crea una nueva contraseña para tu cuenta."
@@ -2692,6 +2682,9 @@ msgstr "Registrate con tu OpenID"
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
+#~ msgid "site title"
+#~ msgstr "Preguntalo.com.uy"
+
 #~ msgid "Have a total of"
 #~ msgstr "Hay un total de"
 
-- 
cgit v1.2.3-1-g7c22


From d5449b465875ff31a28681cf961c18ba94835c15 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <fitoria@fitoria-laptop.(none)>
Date: Mon, 17 Aug 2009 09:56:13 -0600
Subject: fixing question template bug for closed questions

---
 locale/es/LC_MESSAGES/django.mo | Bin 49734 -> 49490 bytes
 locale/es/LC_MESSAGES/django.po | 207 ++++++++++++++++++----------------------
 2 files changed, 92 insertions(+), 115 deletions(-)

(limited to 'locale')

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index bdd1b3b2..5f7daea0 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index b7324b7f..e9e607fe 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,22 +2,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-12 15:53+0000\n"
-"PO-Revision-Date: 2009-08-16 17:05-0600\n"
+"POT-Creation-Date: 2009-08-17 15:55+0000\n"
+"PO-Revision-Date: 2009-08-17 09:55-0600\n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "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:698
+#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699
 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:699
-#: templates/authopenid/confirm_email.txt:10
+#: django_authopenid/urls.py:13 forum/views.py:305 forum/views.py:700
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -76,7 +75,8 @@ msgstr "revisiones/"
 
 #: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
 #: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
-#: forum/models.py:306 forum/views.py:1416
+#: forum/models.py:306 forum/views.py:1192 forum/views.py:1194
+#: forum/views.py:1434
 msgid "questions/"
 msgstr "preguntas/"
 
@@ -112,12 +112,12 @@ msgstr "borrar/"
 msgid "question/"
 msgstr "pregunta/"
 
-#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
+#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2031
 msgid "tags/"
 msgstr "etiquetas/"
 
-#: 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
+#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998
+#: forum/views.py:1436 forum/views.py:1769 forum/views.py:2033
 msgid "users/"
 msgstr "usuarios/"
 
@@ -240,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:699
+#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700
 msgid "newquestion/"
 msgstr "nuevapregunta/"
 
@@ -583,6 +583,7 @@ 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:246
+#, python-format
 msgid "%(author)s modified the question"
 msgstr "%(author)s modificó la pregunta"
 
@@ -706,27 +707,27 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:947
+#: forum/views.py:948
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr "subscripción guardada, %(email)s necesita validación"
 
-#: forum/views.py:1860
+#: forum/views.py:1878
 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:1862
+#: forum/views.py:1880
 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:1864
+#: forum/views.py:1882
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1866
+#: forum/views.py:1884
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -980,7 +981,7 @@ msgstr "Usuarios han sido galardonados con distinciones:"
 msgid "Badges summary"
 msgstr "Resumen de distinciones"
 
-#: templates/badges.html:17 templates/user_stats.html:115
+#: templates/badges.html:17 templates/user_stats.html:73
 msgid "Badges"
 msgstr "Distinciones"
 
@@ -1081,17 +1082,17 @@ msgid "ask the author"
 msgstr "preguntar al autor"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:17
+#: templates/users_questions.html:18
 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/users_questions.html:11 templates/users_questions.html.py:18
 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/unanswered.html:37 templates/users_questions.html:32
 msgid "votes"
 msgstr "votos"
 
@@ -1100,14 +1101,14 @@ 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/unanswered.html:38 templates/users_questions.html:42
 msgid "views"
 msgstr "vistas"
 
 #: 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
+#: templates/unanswered.html.py:106 templates/users_questions.html:54
 msgid "using tags"
 msgstr "usando etiquetas"
 
@@ -1478,14 +1479,14 @@ msgid "all questions"
 msgstr "todas las preguntas"
 
 #: templates/index.html:47 templates/questions.html:45
-#: templates/unanswered.html:36 templates/users_questions.html:35
+#: templates/unanswered.html:36 templates/users_questions.html:37
 msgid "answers"
 msgstr "respuestas"
 
 #: 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
+#: templates/unanswered.html.py:106 templates/users_questions.html:54
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
@@ -1697,20 +1698,19 @@ msgid "add comment"
 msgstr "agregar comentario"
 
 #: templates/question.html:260
-#, python-format
-msgid ""
-"The question has been closed for the following reason \"%(question."
-"get_close_reason_display)s\" by"
-msgstr ""
-"La pregunta ha sido cerrada por el siguiente motivo \"%(question."
-"get_close_reason_display)s\" por"
+msgid "The question has been closed for the following reason"
+msgstr "La pregunta fue cerrada por el siguiente motivo "
+
+#: templates/question.html:260
+msgid "by"
+msgstr "por"
 
 #: templates/question.html:262
-#, python-format
-msgid "close date %(question.closed_at)s"
-msgstr "fecha de cerrada %(question.closed_at)s"
+#, fuzzy
+msgid "close date "
+msgstr "[cerrada]"
 
-#: templates/question.html:269 templates/user_stats.html:28
+#: templates/question.html:269 templates/user_stats.html:13
 msgid "Answers"
 msgstr "Respuestas"
 
@@ -2126,41 +2126,50 @@ msgstr "Enviar mis respuestas a Twitter"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/user_stats.html:16
+#: templates/user_stats.html:10
 msgid "User questions"
 msgstr "Preguntas del usuario"
 
-#: templates/user_stats.html:38
+#: templates/user_stats.html:20
 #, 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:38
+#: templates/user_stats.html:20
 msgid "this answer has been selected as correct"
 msgstr "esta respuesta ha sido seleccionada como correcta"
 
-#: templates/user_stats.html:46
+#: templates/user_stats.html:28
 #, python-format
 msgid "the answer has been commented %(comment_count)s times"
 msgstr "la respuesta ha sido comentada %(comment_count)s veces"
 
-#: templates/user_stats.html:60
-msgid "votes total"
-msgstr "votos totales"
+#: templates/user_stats.html:36
+#, fuzzy
+msgid "Votes"
+msgstr "votos"
+
+#: templates/user_stats.html:41
+msgid "thumb up"
+msgstr ""
 
-#: templates/user_stats.html:69
+#: templates/user_stats.html:42
 msgid "user has voted up this many times"
 msgstr "el usuario ha votado positivo esta cantidad de veces"
 
-#: templates/user_stats.html:74
+#: templates/user_stats.html:46
+msgid "thumb down"
+msgstr ""
+
+#: templates/user_stats.html:47
 msgid "user voted down this many times"
 msgstr "el usuario voto negativo esta cantidad de veces"
 
-#: templates/user_stats.html:87
+#: templates/user_stats.html:54
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/user_stats.html:97
+#: templates/user_stats.html:61
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr "ver otras preguntas etiqueteadas '%(tag)s'"
@@ -2177,6 +2186,11 @@ msgstr "gráfica de la reputación del usuario"
 msgid "reputation history"
 msgstr "historial de reputación"
 
+#: templates/user_tabs.html:23
+#, fuzzy
+msgid "questions that user selected as his/her favorite"
+msgstr "esta pregunta ha sido seleccionada como favorita"
+
 #: templates/user_tabs.html:24
 msgid "favorites"
 msgstr "favoritos"
@@ -2214,7 +2228,15 @@ msgstr "Nada encontrado."
 msgid "this questions was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
-#: templates/users_questions.html:33
+#: templates/users_questions.html:12
+msgid "thumb-up on"
+msgstr ""
+
+#: templates/users_questions.html:19
+msgid "thumb-up off"
+msgstr ""
+
+#: templates/users_questions.html:35
 msgid "this answer has been accepted to be correct"
 msgstr "esta respuesta ha sido aceptada como correcta"
 
@@ -2384,36 +2406,6 @@ msgstr "Registrarse"
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: templates/authopenid/confirm_email.txt:2
-msgid "Thank you for registering at our Q&A forum!"
-msgstr ""
-
-#: templates/authopenid/confirm_email.txt:4
-msgid "Your account details are:"
-msgstr ""
-
-#: templates/authopenid/confirm_email.txt:6
-#: templates/authopenid/sendpw_email.txt:7
-msgid "Username:"
-msgstr "Nombre de usuario:"
-
-#: templates/authopenid/confirm_email.txt:7
-#: templates/authopenid/delete.html:20
-msgid "Password:"
-msgstr "Contraseña"
-
-#: templates/authopenid/confirm_email.txt:9
-msgid "Please sign in here:"
-msgstr ""
-
-#: templates/authopenid/confirm_email.txt:12
-#: templates/authopenid/email_validation.txt:14
-#: templates/authopenid/sendpw_email.txt:13
-msgid ""
-"Sincerely,\n"
-"Forum Administrator"
-msgstr ""
-
 #: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr "Cuenta: borrar cuenta"
@@ -2430,6 +2422,10 @@ msgstr ""
 msgid "Check confirm box, if you want delete your account."
 msgstr "Marca caja de confirmación, si deseas borrar tu cuenta."
 
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr "Contraseña"
+
 #: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr "Estoy seguro que quiero borrar mi cuenta."
@@ -2446,25 +2442,6 @@ msgstr "(requerido por tu seguridad)"
 msgid "Delete account permanently"
 msgstr "Borrar la cuenta de forma permanente"
 
-#: templates/authopenid/email_validation.txt:2
-msgid "Greetings from the Q&A forum"
-msgstr ""
-
-#: templates/authopenid/email_validation.txt:4
-msgid "To make use of the Forum, please follow the link below:"
-msgstr ""
-
-#: templates/authopenid/email_validation.txt:8
-msgid "Following the link above will help us verify your email address."
-msgstr ""
-
-#: templates/authopenid/email_validation.txt:10
-msgid ""
-"If you beleive that this message was sent in mistake - \n"
-"no further action is needed. Just ingore this email, we apologize\n"
-"for any inconvenience"
-msgstr ""
-
 #: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr "Enviar nueva contraseña"
@@ -2501,26 +2478,6 @@ 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/sendpw_email.txt:2
-#, python-format
-msgid ""
-"Someone has requested to reset your password on %(site_url)s.\n"
-"If it were not you, it is safe to ignore this email."
-msgstr ""
-
-#: templates/authopenid/sendpw_email.txt:5
-msgid "Your new account details are:"
-msgstr ""
-
-#: templates/authopenid/sendpw_email.txt:8
-#, fuzzy
-msgid "New password:"
-msgstr "Nueva contraseña:"
-
-#: templates/authopenid/sendpw_email.txt:10
-msgid "To confirm that you wanted to reset your password please visit:"
-msgstr ""
-
 #: templates/authopenid/settings.html:30
 msgid "Give your  account a new password."
 msgstr "Crea una nueva contraseña para tu cuenta."
@@ -2682,6 +2639,26 @@ msgstr "Registrate con tu OpenID"
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
+#~ 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"
+
+#~ msgid "close date %(question.closed_at)s"
+#~ msgstr "fecha de cerrada %(question.closed_at)s"
+
+#~ msgid "votes total"
+#~ msgstr "votos totales"
+
+#~ msgid "Username:"
+#~ msgstr "Nombre de usuario:"
+
+#, fuzzy
+#~ msgid "New password:"
+#~ msgstr "Nueva contraseña:"
+
 #~ msgid "site title"
 #~ msgstr "Preguntalo.com.uy"
 
-- 
cgit v1.2.3-1-g7c22


From 3a4b6ad43221abc0e0ff345d9368c3348b312128 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 19 Aug 2009 21:30:15 -0400
Subject: added Adolfos mods, django_authopeid bug, unified traditional and
 OpenID login

---
 locale/en/LC_MESSAGES/django.mo | Bin 14334 -> 15146 bytes
 locale/en/LC_MESSAGES/django.po | 229 +++++++++++++++-----------
 locale/es/LC_MESSAGES/django.mo | Bin 49490 -> 49819 bytes
 locale/es/LC_MESSAGES/django.po | 346 ++++++++++++++++++++++------------------
 4 files changed, 320 insertions(+), 255 deletions(-)

(limited to 'locale')

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 447afac4..cd8de560 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 ff280947..b5e5c549 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-12 15:41+0000\n"
+"POT-Creation-Date: 2009-08-19 00:41+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,13 +16,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:698
+#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699
 msgid "account/"
 msgstr ""
 
 #: 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
+#: django_authopenid/urls.py:13 forum/views.py:305 forum/views.py:700
 #: templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr ""
@@ -82,7 +82,8 @@ 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
+#: forum/models.py:306 forum/views.py:1188 forum/views.py:1190
+#: forum/views.py:1430
 msgid "questions/"
 msgstr ""
 
@@ -118,12 +119,12 @@ msgstr ""
 msgid "question/"
 msgstr ""
 
-#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
+#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2027
 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
+#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998
+#: forum/views.py:1432 forum/views.py:1765 forum/views.py:2029
 msgid "users/"
 msgstr ""
 
@@ -238,7 +239,7 @@ msgstr ""
 msgid "Incorrect username."
 msgstr ""
 
-#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699
+#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700
 msgid "newquestion/"
 msgstr ""
 
@@ -695,27 +696,27 @@ msgstr ""
 msgid "profile - user preferences"
 msgstr ""
 
-#: forum/views.py:947
+#: forum/views.py:948
 #, 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 <a href='/faq#validate'>more details here</a>"
 
-#: forum/views.py:1860
+#: forum/views.py:1874
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr ""
 
-#: forum/views.py:1862
+#: forum/views.py:1876
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1864
+#: forum/views.py:1878
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1866
+#: forum/views.py:1880
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -723,7 +724,7 @@ msgstr ""
 
 #: forum/management/commands/send_email_alerts.py:35
 msgid "updates from website"
-msgstr ""
+msgstr "Q&amp;A forum update"
 
 #: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
 #: templates/header.html:35
@@ -937,7 +938,7 @@ msgid "must have valid %(email)s to post"
 msgstr ""
 "<span class='strong big'>Looks like your email address, %(email)s has not "
 "yet been validated.</span> To post messages you must verify your email, "
-"please see <a href='/faq#validate'>more details here</a>.<br/>You can submit "
+"please see <a href='/faq#validate'>more details here</a>.<br>You can submit "
 "your question now and validate email after that. Your question will saved as "
 "pending meanwhile. "
 
@@ -965,7 +966,7 @@ msgstr ""
 msgid "Badges summary"
 msgstr ""
 
-#: templates/badges.html:17 templates/user_stats.html:115
+#: templates/badges.html:17 templates/user_stats.html:73
 msgid "Badges"
 msgstr ""
 
@@ -1070,17 +1071,17 @@ msgid "ask the author"
 msgstr ""
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:17
+#: templates/users_questions.html:18
 msgid "this question was selected as favorite"
 msgstr ""
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:11 templates/users_questions.html.py:17
+#: templates/users_questions.html:11 templates/users_questions.html.py:18
 msgid "number of times"
 msgstr ""
 
 #: templates/book.html:105 templates/index.html:48 templates/questions.html:46
-#: templates/unanswered.html:37 templates/users_questions.html:30
+#: templates/unanswered.html:37 templates/users_questions.html:32
 msgid "votes"
 msgstr ""
 
@@ -1089,14 +1090,14 @@ msgid "the answer has been accepted to be correct"
 msgstr ""
 
 #: templates/book.html:115 templates/index.html:49 templates/questions.html:47
-#: templates/unanswered.html:38 templates/users_questions.html:40
+#: templates/unanswered.html:38 templates/users_questions.html:42
 msgid "views"
 msgstr ""
 
 #: 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
+#: templates/unanswered.html.py:106 templates/users_questions.html:54
 msgid "using tags"
 msgstr ""
 
@@ -1265,13 +1266,13 @@ msgid "how to validate email info"
 msgstr ""
 "<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
 "\"bigger strong\">How?</span> If you have just set or changed your email "
-"address - <strong>check your email and click the included link</strong>.<br/"
-">The link contains a key generated specifically for you. You can also "
+"address - <strong>check your email and click the included link</strong>."
+"<br>The link contains a key generated specifically for you. You can also "
 "<button style='display:inline' type='submit'><strong>get a new key</strong></"
 "button> and check your email again.</p></form><span class=\"bigger strong"
 "\">Why?</span> Email validation is required to make sure that <strong>only "
 "you can post messages</strong> on your behalf and to <strong>minimize spam</"
-"strong> posts.<br/>With email you can <strong>subscribe for updates</strong> "
+"strong> posts.<br>With email you can <strong>subscribe for updates</strong> "
 "on the most interesting questions. Also, when you sign up for the first time "
 "- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
 "personal image.</p>"
@@ -1342,35 +1343,35 @@ msgstr ""
 msgid "."
 msgstr ""
 
-#: templates/footer.html:7 templates/header.html:14 templates/index.html:83
+#: templates/footer.html:8 templates/header.html:14 templates/index.html:83
 msgid "about"
 msgstr ""
 
-#: templates/footer.html:8 templates/header.html:15 templates/index.html:84
+#: templates/footer.html:9 templates/header.html:15 templates/index.html:84
 #: templates/question_edit_tips.html:16
 msgid "faq"
 msgstr ""
 
-#: templates/footer.html:9
+#: templates/footer.html:10
+msgid "wiki"
+msgstr ""
+
+#: templates/footer.html:11
 msgid "blog"
 msgstr ""
 
-#: templates/footer.html:10
+#: templates/footer.html:12
 msgid "contact us"
 msgstr ""
 
-#: templates/footer.html:11
+#: templates/footer.html:13
 msgid "privacy policy"
 msgstr ""
 
-#: templates/footer.html:12
+#: templates/footer.html:14
 msgid "give feedback"
 msgstr ""
 
-#: templates/footer.html:18
-msgid "current revision"
-msgstr ""
-
 #: templates/header.html:10
 msgid "logout"
 msgstr ""
@@ -1518,6 +1519,9 @@ msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
+"Clicking <strong>Logout</strong> will log you out from the Q&amp;A forum.</"
+"p><p>If you wish to sign off completely - please make sure to log out from "
+"your OpenID provider."
 
 #: templates/logout.html:21
 msgid "Logout now"
@@ -1670,7 +1674,7 @@ msgstr ""
 msgid "close date %(question.closed_at)s"
 msgstr ""
 
-#: templates/question.html:269 templates/user_stats.html:28
+#: templates/question.html:269 templates/user_stats.html:13
 msgid "Answers"
 msgstr " Answers"
 
@@ -1849,12 +1853,12 @@ msgid_plural ""
 "\t\t\t"
 msgstr[0] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>question tagged <span "
-"class=\"tag\">%(tagname)s</span>"
+"<div class=\"questions-count\">%(q_num)s</div><p>question tagged</p><p><span "
+"class=\"tag\">%(tagname)s</span></p>"
 msgstr[1] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged <span "
-"class=\"tag\">%(tagname)s</span>"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
+"class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
 
 #: templates/questions.html:116
 #, python-format
@@ -1868,12 +1872,14 @@ msgid_plural ""
 "\t\t\t\t"
 msgstr[0] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>question with title "
-"containing <span class=\"darkred strong\">%(searchtitle)s</span>"
+"<div class=\"questions-count\">%(q_num)s</div><p>question with title "
+"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
+"p>"
 msgstr[1] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>questions with title "
-"containing <span class=\"darkred strong\">%(searchtitle)s</span></strong>"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions with title "
+"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
+"p>"
 
 #: templates/questions.html:122
 #, python-format
@@ -1887,10 +1893,10 @@ msgid_plural ""
 "\t\t\t\t"
 msgstr[0] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>question"
+"<div class=\"questions-count\">%(q_num)s</div><p>question</p>"
 msgstr[1] ""
 "\n"
-"<span class=\"questions-count\">%(q_num)s</span><br/>questions"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
 
 #: templates/questions.html:131
 msgid "latest questions info"
@@ -1997,8 +2003,8 @@ msgstr ""
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<span class=\"questions-count\">%(num_q)s</span><br/> questions with "
-"<strong>no accepted answers</strong>"
+"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
+"questions"
 
 #: templates/user_edit.html:6
 msgid "Edit user profile"
@@ -2088,41 +2094,49 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/user_stats.html:16
+#: templates/user_stats.html:10
 msgid "User questions"
 msgstr ""
 
-#: templates/user_stats.html:38
+#: templates/user_stats.html:20
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:38
+#: templates/user_stats.html:20
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:46
+#: templates/user_stats.html:28
 #, python-format
 msgid "the answer has been commented %(comment_count)s times"
-msgstr "(%(comment_count)s comment(s))"
+msgstr ""
 
-#: templates/user_stats.html:60
-msgid "votes total"
-msgstr "Votes"
+#: templates/user_stats.html:36
+msgid "Votes"
+msgstr ""
+
+#: templates/user_stats.html:41
+msgid "thumb up"
+msgstr ""
 
-#: templates/user_stats.html:69
+#: templates/user_stats.html:42
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:74
+#: templates/user_stats.html:46
+msgid "thumb down"
+msgstr ""
+
+#: templates/user_stats.html:47
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:87
+#: templates/user_stats.html:54
 msgid "Tags"
 msgstr ""
 
-#: templates/user_stats.html:97
+#: templates/user_stats.html:61
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
@@ -2139,6 +2153,10 @@ msgstr ""
 msgid "reputation history"
 msgstr ""
 
+#: templates/user_tabs.html:23
+msgid "questions that user selected as his/her favorite"
+msgstr ""
+
 #: templates/user_tabs.html:24
 msgid "favorites"
 msgstr ""
@@ -2176,7 +2194,15 @@ msgstr ""
 msgid "this questions was selected as favorite"
 msgstr ""
 
-#: templates/users_questions.html:33
+#: templates/users_questions.html:12
+msgid "thumb-up on"
+msgstr ""
+
+#: templates/users_questions.html:19
+msgid "thumb-up off"
+msgstr ""
+
+#: templates/users_questions.html:35
 msgid "this answer has been accepted to be correct"
 msgstr ""
 
@@ -2207,7 +2233,7 @@ msgstr ""
 "anyone, must be valid)"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:154
 msgid "Password"
 msgstr ""
 
@@ -2219,6 +2245,12 @@ msgstr ""
 #, python-format
 msgid "validate %(email)s info"
 msgstr ""
+"<span class=\"strong big\">An email with a validation link has been sent to %"
+"(email)s.</span> Please <strong>follow the emailed link</strong> with your "
+"web browser. Email validation is necessary to help insure the proper use of "
+"email on <span class=\"orange\">Q&amp;A</span> forum. If you would like "
+"to use <strong>another email</strong>, please <a href=\"/email/change/"
+"\"><strong>change it again</strong></a>."
 
 #: templates/authopenid/changeemail.html:50
 msgid "Email not changed"
@@ -2324,7 +2356,7 @@ msgstr "New user signup"
 #, python-format
 msgid "register new %(provider)s account info"
 msgstr ""
-"<span class=\"big strong\">You are here for the first time with your %"
+"<p><span class=\"big strong\">You are here for the first time with your %"
 "(provider)s login.</span> Please create your <strong>screen name</strong> "
 "and save your <strong>email</strong> address. Saved email address will let "
 "you <strong>subscribe for the updates</strong> on the most interesting "
@@ -2336,7 +2368,7 @@ msgid "This account already exists, please use another."
 msgstr ""
 
 #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/signin.html:120
+#: templates/authopenid/signin.html:138
 msgid "Sorry, looks like we have some errors:"
 msgstr ""
 
@@ -2362,7 +2394,7 @@ msgstr ""
 msgid "user name"
 msgstr ""
 
-#: templates/authopenid/complete.html:58
+#: templates/authopenid/complete.html:58 templates/authopenid/signin.html:128
 msgid "password"
 msgstr ""
 
@@ -2370,13 +2402,13 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:156
 msgid "Forgot your password?"
 msgstr ""
 
 #: templates/authopenid/confirm_email.txt:2
 msgid "Thank you for registering at our Q&A forum!"
-msgstr "Thank you for registering at our Q&amp;A forum!"
+msgstr ""
 
 #: templates/authopenid/confirm_email.txt:4
 msgid "Your account details are:"
@@ -2559,77 +2591,87 @@ msgstr ""
 #: templates/authopenid/signin.html:40
 msgid "Click to sign in through any of these services."
 msgstr ""
-"<p><span class=\"big strong\">We accept <a href=\"http://openid.net"
-"\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new "
-"password - log in through any of the services below.</font></p><p><span "
-"class=\"big strong\">1. Select the login service by clicking one of the "
-"icons</span></p>"
+"<p><span class=\"big strong\">Please select your favorite login method below.</span>"
+"</p><p><font color=\"gray\">External login services use <a "
+"href=\"http://openid.net\"><b>OpenID</b></a> technology that increases "
+"security of your online identity and makes login process simpler. First option "
+"requires login name and password.</font></p>"
 
-#: templates/authopenid/signin.html:103
+#: templates/authopenid/signin.html:113
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
 msgstr ""
-"<span class=\"big strong\">2. Enter your <span id=\"enter_your_what"
-"\">Provider user name</span></span><br/>(or select another OpenID provider "
-"above)"
+"<span class=\"big strong\">Enter your <span id=\"enter_your_what\">Provider "
+"user name</span></span><br><span class='grey'>(or select another login method above)</span>"
 
-#: templates/authopenid/signin.html:110
+#: templates/authopenid/signin.html:120
 msgid ""
 "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
 "web address"
 msgstr ""
-"<span class=\"big strong\">2. Enter your <a class=\"openid_logo\" href="
-"\"http://openid.net\">OpenID</a> web address</span><br/>(or choose specific "
-"provider by clicking on one of the icons above)"
+"<span class=\"big strong\">Enter your <a class=\"openid_logo\" href=\"http://"
+"openid.net\">OpenID</a> web address</span><br><span class='grey'>(or choose another login "
+"method above)</span>"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:122 templates/authopenid/signin.html:130
+#: templates/authopenid/signin.html:155
 msgid "Login"
 msgstr ""
 
-#: templates/authopenid/signin.html:116
+#: templates/authopenid/signin.html:125
+msgid "Enter your login name and password"
+msgstr ""
+"<span class='big strong'>Enter your forum login and password</span><br/>"
+"<span class='grey'>(or select your OpenID provider above)</span>"
+
+#: templates/authopenid/signin.html:126
+msgid "login name"
+msgstr ""
+
+#: templates/authopenid/signin.html:134
 msgid "we support two login modes"
 msgstr ""
 "You can log in either through one of these services or traditionally - using "
 "local username/password."
 
-#: templates/authopenid/signin.html:134
+#: templates/authopenid/signin.html:152
 msgid "Use login name and password"
 msgstr ""
 
-#: templates/authopenid/signin.html:135
+#: templates/authopenid/signin.html:153
 msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:139
+#: templates/authopenid/signin.html:157
 msgid "Create new account"
 msgstr ""
 
-#: templates/authopenid/signin.html:148
+#: templates/authopenid/signin.html:166
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:151
+#: templates/authopenid/signin.html:169
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:154
+#: templates/authopenid/signin.html:172
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:157
+#: templates/authopenid/signin.html:175
 msgid "openid is widely adopted"
 msgstr ""
 "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
 "enabled."
 
-#: templates/authopenid/signin.html:160
+#: templates/authopenid/signin.html:178
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:165
+#: templates/authopenid/signin.html:183
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:184
 msgid "Get OpenID"
 msgstr ""
 
@@ -2671,11 +2713,6 @@ msgstr ""
 msgid "Login with your OpenID"
 msgstr ""
 
-#~ msgid "what is this website"
-#~ msgstr ""
-#~ "This is a collaboratively edited question and answer site for the "
-#~ "Magnetic Resonance specialists."
-
 #
 #~ msgid "editing tips"
 #~ msgstr "Tips"
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 5f7daea0..91639ba1 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index e9e607fe..d7655dd7 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,21 +2,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-17 15:55+0000\n"
-"PO-Revision-Date: 2009-08-17 09:55-0600\n"
+"POT-Creation-Date: 2009-08-17 16:44+0000\n"
+"PO-Revision-Date: 2009-08-17 10:04-0600\n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699
+#: settings.py:12 urls.py:25 forum/views.py:310 forum/views.py:705
 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:305 forum/views.py:700
+#: django_authopenid/urls.py:13 forum/views.py:310 forum/views.py:706
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -24,128 +24,132 @@ msgstr "ingresar/"
 msgid "upfiles/"
 msgstr "archivossubidos/"
 
-#: urls.py:27 urls.py:28 urls.py:29 django_authopenid/urls.py:26
+#: urls.py:27 django_authopenid/urls.py:16
+msgid "signup/"
+msgstr "registrarse/"
+
+#: urls.py:28 urls.py:29 urls.py:30 django_authopenid/urls.py:26
 #: django_authopenid/urls.py:27
 msgid "email/"
 msgstr "email/"
 
-#: urls.py:27
+#: urls.py:28
 msgid "change/"
 msgstr "cambiar/"
 
-#: urls.py:28
+#: urls.py:29
 msgid "sendkey/"
 msgstr "enviarclave/"
 
-#: urls.py:29
+#: urls.py:30
 msgid "verify/"
 msgstr "verificar/"
 
-#: urls.py:30
+#: urls.py:31
 msgid "about/"
 msgstr "acercadenosotros/"
 
-#: urls.py:31
+#: urls.py:32
 msgid "faq/"
 msgstr "preguntasfrecuentes/"
 
-#: urls.py:32
+#: urls.py:33
 msgid "privacy/"
 msgstr "códigodeprivacidad/"
 
-#: urls.py:33
+#: urls.py:34
 msgid "logout/"
 msgstr "cerrarsesion/"
 
-#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
+#: urls.py:35 urls.py:36 urls.py:37 urls.py:49 forum/models.py:425
 msgid "answers/"
 msgstr "respuestas/"
 
-#: urls.py:34 urls.py:46
+#: urls.py:35 urls.py:47
 msgid "comments/"
 msgstr "comentarios/"
 
-#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
+#: urls.py:36 urls.py:41 urls.py:55 templates/user_info.html:34
 msgid "edit/"
 msgstr "editar/"
 
-#: urls.py:36 urls.py:45
+#: urls.py:37 urls.py:46
 msgid "revisions/"
 msgstr "revisiones/"
 
-#: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42
-#: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19
-#: forum/models.py:306 forum/views.py:1192 forum/views.py:1194
-#: forum/views.py:1434
+#: urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 urls.py:43
+#: urls.py:44 urls.py:45 urls.py:46 urls.py:47 urls.py:48 forum/feed.py:19
+#: forum/models.py:313 forum/views.py:1232 forum/views.py:1234
+#: forum/views.py:1474
 msgid "questions/"
 msgstr "preguntas/"
 
-#: urls.py:38 urls.py:64
+#: urls.py:39 urls.py:65
 msgid "ask/"
 msgstr "preguntar/"
 
-#: urls.py:39
+#: urls.py:40
 msgid "unanswered/"
 msgstr "sinrespuesta/"
 
-#: urls.py:41
+#: urls.py:42
 msgid "close/"
 msgstr "cerrar/"
 
-#: urls.py:42
+#: urls.py:43
 msgid "reopen/"
 msgstr "reabrir/"
 
-#: urls.py:43
+#: urls.py:44
 msgid "answer/"
 msgstr "respuesta/"
 
-#: urls.py:44
+#: urls.py:45
 msgid "vote/"
 msgstr "votar/"
 
-#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
+#: urls.py:48 urls.py:49 django_authopenid/urls.py:29
 msgid "delete/"
 msgstr "borrar/"
 
-#: urls.py:50
+#: urls.py:51
 msgid "question/"
 msgstr "pregunta/"
 
-#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2031
+#: urls.py:52 urls.py:53 forum/views.py:747 forum/views.py:2071
 msgid "tags/"
 msgstr "etiquetas/"
 
-#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998
-#: forum/views.py:1436 forum/views.py:1769 forum/views.py:2033
+#: urls.py:54 urls.py:55 urls.py:56 forum/views.py:1034 forum/views.py:1038
+#: forum/views.py:1476 forum/views.py:1809 forum/views.py:2073
 msgid "users/"
 msgstr "usuarios/"
 
-#: urls.py:56 urls.py:57
+#: urls.py:57 urls.py:58
 msgid "badges/"
 msgstr "distinciones/"
 
-#: urls.py:58
+#: urls.py:59
 msgid "messages/"
 msgstr "mensajes/"
 
-#: urls.py:58
+#: urls.py:59
 msgid "markread/"
 msgstr "marcarleido/"
 
-#: urls.py:60
+#: urls.py:61
 msgid "nimda/"
 msgstr "administrador/"
 
-#: urls.py:62
+#: urls.py:63
 msgid "upload/"
 msgstr "subir/"
 
-#: urls.py:63 urls.py:64 urls.py:65
+#: urls.py:64 urls.py:65 urls.py:66
 msgid "books/"
 msgstr "libros/"
 
-#: urls.py:66
+#: urls.py:67
 msgid "search/"
 msgstr "buscar/"
 
@@ -240,7 +244,7 @@ msgstr "la nueva contraseña no coincide"
 msgid "Incorrect username."
 msgstr "Nombre de usuario incorrecto"
 
-#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700
+#: django_authopenid/urls.py:10 forum/views.py:310 forum/views.py:706
 msgid "newquestion/"
 msgstr "nuevapregunta/"
 
@@ -260,14 +264,19 @@ msgstr "completado/"
 msgid "register/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:16
-msgid "signup/"
-msgstr "registrarse/"
-
-#: django_authopenid/urls.py:18
+#: django_authopenid/urls.py:19
 msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
+#: django_authopenid/urls.py:20
+#, fuzzy
+msgid "password/"
+msgstr "contraseña"
+
+#: django_authopenid/urls.py:20
+msgid "confirm/"
+msgstr ""
+
 #: django_authopenid/urls.py:27
 msgid "validate/"
 msgstr ""
@@ -523,8 +532,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:209
-#: templates/question.html.py:395 templates/questions.html:58
+#: forum/forms.py:75 templates/index.html:57 templates/question.html:210
+#: templates/question.html.py:396 templates/questions.html:58
 #: templates/questions.html.py:70 templates/unanswered.html:48
 #: templates/unanswered.html.py:60
 msgid "community wiki"
@@ -550,76 +559,84 @@ 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:175
+#: forum/forms.py:98 forum/forms.py:159
+msgid "please choice a category"
+msgstr "por favor escoja una categoría"
+
+#: forum/forms.py:99 forum/forms.py:160
+msgid "Category"
+msgstr "Categoría"
+
+#: forum/forms.py:180
 msgid "this email does not have to be linked to gravatar"
 msgstr "este email no tiene porque estar asociado a un Gravatar"
 
-#: forum/forms.py:176
+#: forum/forms.py:181
 msgid "Real name"
 msgstr "Nombre real"
 
-#: forum/forms.py:177
+#: forum/forms.py:182
 msgid "Website"
 msgstr "Sitio Web"
 
-#: forum/forms.py:178
+#: forum/forms.py:183
 msgid "Location"
 msgstr "Ubicación"
 
-#: forum/forms.py:179
+#: forum/forms.py:184
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: forum/forms.py:179
+#: forum/forms.py:184
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD"
 
-#: forum/forms.py:180 templates/authopenid/settings.html:21
+#: forum/forms.py:185 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr "Perfil"
 
-#: forum/forms.py:207 forum/forms.py:208
+#: forum/forms.py:212 forum/forms.py:213
 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:246
+#: forum/models.py:253
 #, python-format
 msgid "%(author)s modified the question"
 msgstr "%(author)s modificó la pregunta"
 
-#: forum/models.py:250
+#: forum/models.py:257
 #, 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:255
+#: forum/models.py:262
 #, python-format
 msgid "%(people)s commented the question"
 msgstr "%(people)s comentarion la pregunta"
 
-#: forum/models.py:260
+#: forum/models.py:267
 #, python-format
 msgid "%(people)s commented answers"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:262
+#: forum/models.py:269
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:306 forum/models.py:418
+#: forum/models.py:313 forum/models.py:425
 msgid "revisions"
 msgstr "revisiones/"
 
-#: forum/models.py:441 templates/badges.html:51
+#: forum/models.py:448 templates/badges.html:51
 msgid "gold"
 msgstr "oro"
 
-#: forum/models.py:442 templates/badges.html:59
+#: forum/models.py:449 templates/badges.html:59
 msgid "silver"
 msgstr "plata"
 
-#: forum/models.py:443 templates/badges.html:66
+#: forum/models.py:450 templates/badges.html:66
 msgid "bronze"
 msgstr "bronce"
 
@@ -707,27 +724,27 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:948
+#: forum/views.py:988
 #, python-format
 msgid "subscription saved, %(email)s needs validation"
 msgstr "subscripción guardada, %(email)s necesita validación"
 
-#: forum/views.py:1878
+#: forum/views.py:1918
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr "para subir imagenes debes tener más de 60 puntos de reputación"
 
-#: forum/views.py:1880
+#: forum/views.py:1920
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', "
 "'tiff'"
 
-#: forum/views.py:1882
+#: forum/views.py:1922
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr "tamaño máximo permitido es archivo %sK"
 
-#: forum/views.py:1884
+#: forum/views.py:1924
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -851,22 +868,22 @@ msgid "select revision"
 msgstr "seleccionar revisión"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:467 templates/question_edit.html:91
+#: templates/question.html:468 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:467 templates/question_edit.html:91
+#: templates/question.html:468 templates/question_edit.html:91
 msgid "toggle preview"
 msgstr "Activar previsualización"
 
-#: templates/answer_edit.html:71 templates/question_edit.html:115
+#: templates/answer_edit.html:71 templates/question_edit.html:121
 #: templates/question_retag.html:73
 msgid "Save edit"
 msgstr "Guardar la edición"
 
 #: templates/answer_edit.html:72 templates/close.html:29
-#: templates/question_edit.html:116 templates/question_retag.html:74
+#: templates/question_edit.html:122 templates/question_retag.html:74
 #: templates/reopen.html:30 templates/user_edit.html:83
 #: templates/authopenid/changeemail.html:34
 msgid "Cancel"
@@ -957,15 +974,16 @@ msgstr ""
 "a>. <br/> 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:107
+#: templates/ask.html:107 templates/ask.html.py:114
+#: templates/question_edit.html:117
 msgid "(required)"
 msgstr "(requerido)"
 
-#: templates/ask.html:114
+#: templates/ask.html:121
 msgid "Login/signup to post your question"
 msgstr "Iniciar sesión/registrarse para publicar su pregunta"
 
-#: templates/ask.html:116
+#: templates/ask.html:123
 msgid "Ask your question"
 msgstr "Haz tu pregunta"
 
@@ -1105,8 +1123,8 @@ msgstr "la respuesta ha sido aceptada como correcta"
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/index.html:69 templates/question.html:499
-#: templates/questions.html:84 templates/questions.html.py:156
+#: templates/book.html:125 templates/index.html:69 templates/question.html:500
+#: templates/questions.html:84 templates/questions.html.py:157
 #: templates/tags.html:49 templates/unanswered.html:75
 #: templates/unanswered.html.py:106 templates/users_questions.html:54
 msgid "using tags"
@@ -1120,6 +1138,23 @@ msgstr "suscribirse al RSS del libro"
 msgid "subscribe to the questions feed"
 msgstr "suscribirse al agregado de noticias"
 
+#: templates/categories.html:6 templates/categories.html.py:29
+msgid "Category list"
+msgstr "Lista de Categorías"
+
+#: templates/categories.html:34 templates/tags.html:42
+msgid "Nothing found"
+msgstr "Nada encontrado"
+
+#: templates/categories.html:40
+#, fuzzy
+msgid "see questions that matches"
+msgstr "ver preguntas etiquetadas"
+
+#: templates/categories.html:40
+msgid "category "
+msgstr "categoría"
+
 #: templates/close.html:6 templates/close.html.py:16
 msgid "Close question"
 msgstr "Cerrar pregunta"
@@ -1483,8 +1518,8 @@ msgstr "todas las preguntas"
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:69 templates/question.html:499
-#: templates/questions.html:84 templates/questions.html.py:156
+#: templates/index.html:69 templates/question.html:500
+#: templates/questions.html:84 templates/questions.html.py:157
 #: templates/tags.html:49 templates/unanswered.html:75
 #: templates/unanswered.html.py:106 templates/users_questions.html:54
 msgid "see questions tagged"
@@ -1633,7 +1668,7 @@ msgid "i like this post (click again to cancel)"
 msgstr "Me gusta esta entrada (clickear devuelta para cancelar)"
 
 #: templates/question.html:75 templates/question.html.py:89
-#: templates/question.html:289
+#: templates/question.html:290
 msgid "current number of votes"
 msgstr "número actual de votos"
 
@@ -1652,168 +1687,171 @@ msgstr ""
 "remover marca de favorito a esta pregunta (clickear devuelta para volver a "
 "marcar)"
 
-#: templates/question.html:134 templates/question.html.py:322
+#: templates/question.html:128 templates/questions.html:87
+msgid "Category: "
+msgstr "Categoría: "
+
+#: templates/question.html:135 templates/question.html.py:323
 #: templates/revisions_answer.html:53 templates/revisions_question.html:53
 msgid "edit"
 msgstr "editar"
 
-#: templates/question.html:138 templates/question.html.py:332
+#: templates/question.html:139 templates/question.html.py:333
 msgid "delete"
 msgstr "borrar"
 
-#: templates/question.html:143
+#: templates/question.html:144
 msgid "reopen"
 msgstr "re-abrir"
 
-#: templates/question.html:148
+#: templates/question.html:149
 msgid "close"
 msgstr "cerrar"
 
-#: templates/question.html:154 templates/question.html.py:345
+#: templates/question.html:155 templates/question.html.py:346
 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:155 templates/question.html.py:346
+#: templates/question.html:156 templates/question.html.py:347
 msgid "flag offensive"
 msgstr "marcar como ofensivo"
 
-#: templates/question.html:167 templates/question.html.py:355
+#: templates/question.html:168 templates/question.html.py:356
 #: templates/revisions_answer.html:65 templates/revisions_question.html:65
 msgid "updated"
 msgstr "actualizado"
 
-#: templates/question.html:216 templates/question.html.py:402
+#: templates/question.html:217 templates/question.html.py:403
 #: templates/revisions_answer.html:63 templates/revisions_question.html:63
 msgid "asked"
 msgstr "preguntado"
 
-#: templates/question.html:246 templates/question.html.py:429
+#: templates/question.html:247 templates/question.html.py:430
 msgid "comments"
 msgstr "comentarios"
 
-#: templates/question.html:247 templates/question.html.py:430
+#: templates/question.html:248 templates/question.html.py:431
 msgid "add comment"
 msgstr "agregar comentario"
 
-#: templates/question.html:260
+#: templates/question.html:261
 msgid "The question has been closed for the following reason"
 msgstr "La pregunta fue cerrada por el siguiente motivo "
 
-#: templates/question.html:260
+#: templates/question.html:261
 msgid "by"
 msgstr "por"
 
-#: templates/question.html:262
-#, fuzzy
+#: templates/question.html:263
 msgid "close date "
-msgstr "[cerrada]"
+msgstr "fecha de cierre"
 
-#: templates/question.html:269 templates/user_stats.html:13
+#: templates/question.html:270 templates/user_stats.html:13
 msgid "Answers"
 msgstr "Respuestas"
 
-#: templates/question.html:271
+#: templates/question.html:272
 msgid "oldest answers will be shown first"
 msgstr "la respuesta mas vieja será mostrada primero"
 
-#: templates/question.html:271
+#: templates/question.html:272
 msgid "oldest answers"
 msgstr "pregunta más vieja"
 
-#: templates/question.html:272
+#: templates/question.html:273
 msgid "newest answers will be shown first"
 msgstr "preguntas más nuevas serán mostradas primero"
 
-#: templates/question.html:272
+#: templates/question.html:273
 msgid "newest answers"
 msgstr "más nuevas"
 
-#: templates/question.html:273
+#: templates/question.html:274
 msgid "most voted answers will be shown first"
 msgstr "las preguntas más votadas serán mostradas primero"
 
-#: templates/question.html:273
+#: templates/question.html:274
 msgid "popular answers"
 msgstr "respuestas populares"
 
-#: templates/question.html:287 templates/question.html.py:288
+#: templates/question.html:288 templates/question.html.py:289
 msgid "i like this answer (click again to cancel)"
 msgstr "me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:294 templates/question.html.py:295
+#: templates/question.html:295 templates/question.html.py:296
 msgid "i dont like this answer (click again to cancel)"
 msgstr "no me gusta esta respuesta (clickear devuelta para cancelar)"
 
-#: templates/question.html:300 templates/question.html.py:301
+#: templates/question.html:301 templates/question.html.py:302
 msgid "mark this answer as favorite (click again to undo)"
 msgstr "marcar esta respuesta como favorita (clickear devuelta para deshacer)"
 
-#: templates/question.html:306 templates/question.html.py:307
+#: templates/question.html:307 templates/question.html.py:308
 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:329
+#: templates/question.html:330
 msgid "undelete"
 msgstr "deshacer eliminar"
 
-#: templates/question.html:339
+#: templates/question.html:340
 msgid "answer permanent link"
 msgstr "enlace permanente a respuesta"
 
-#: templates/question.html:340
+#: templates/question.html:341
 msgid "permanent link"
 msgstr "enlace permanente"
 
-#: templates/question.html:453
+#: templates/question.html:454
 msgid "Your answer"
 msgstr "Tu respuesta"
 
-#: templates/question.html:456
+#: templates/question.html:457
 msgid "you can answer anonymously and then login"
 msgstr "puedes responder de forma anónima y luego ingresar"
 
-#: templates/question.html:479
+#: templates/question.html:480
 msgid "Answer the question"
 msgstr "Responde la pregunta"
 
-#: templates/question.html:481
+#: templates/question.html:482
 msgid "Notify me daily if there are any new answers."
 msgstr "Notificarme diariamente si hay nuevas respuestas."
 
-#: templates/question.html:483
+#: templates/question.html:484
 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:494
+#: templates/question.html:495
 msgid "Question tags"
 msgstr "Tags de la pregunta"
 
-#: templates/question.html:504
+#: templates/question.html:505
 msgid "question asked"
 msgstr "pregunta preguntada"
 
-#: templates/question.html:504 templates/question.html.py:510
+#: templates/question.html:505 templates/question.html.py:511
 #: templates/user_info.html:51
 msgid "ago"
 msgstr " atras"
 
-#: templates/question.html:507
+#: templates/question.html:508
 msgid "question was seen"
 msgstr "la pregunta fue vista"
 
-#: templates/question.html:507
+#: templates/question.html:508
 msgid "times"
 msgstr "veces"
 
-#: templates/question.html:510
+#: templates/question.html:511
 msgid "last updated"
 msgstr "última vez actualizada"
 
-#: templates/question.html:515
+#: templates/question.html:516
 msgid "Related questions"
 msgstr "Preguntas relacionadas"
 
@@ -1878,7 +1916,7 @@ msgstr "preguntas actualizadas más recientemente"
 msgid "active"
 msgstr "actividad"
 
-#: templates/questions.html:109
+#: templates/questions.html:110
 #, python-format
 msgid ""
 "\n"
@@ -1897,7 +1935,7 @@ msgstr[1] ""
 "\t\t\ttiene un total de %(q_num)s preguntas etiquetadas con %(tagname)s\n"
 "\t\t\t"
 
-#: templates/questions.html:116
+#: templates/questions.html:117
 #, python-format
 msgid ""
 "\n"
@@ -1916,7 +1954,7 @@ msgstr[1] ""
 "\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n"
 "\t\t\t"
 
-#: templates/questions.html:122
+#: templates/questions.html:123
 #, fuzzy, python-format
 msgid ""
 "\n"
@@ -1929,36 +1967,36 @@ msgid_plural ""
 msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
 msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
 
-#: templates/questions.html:131
+#: templates/questions.html:132
 msgid "latest questions info"
 msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/questions.html:135
+#: templates/questions.html:136
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 "Las preguntas estan ordenadas por <strong>fecha de último update</strong>."
 
-#: templates/questions.html:136
+#: templates/questions.html:137
 msgid "Most recently answered ones are shown first."
 msgstr "Las más recientemente respondidas son mostradas primero."
 
-#: templates/questions.html:140
+#: templates/questions.html:141
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Preguntas ordenadas por <strong>número de respuestas</strong>."
 
-#: templates/questions.html:141
+#: templates/questions.html:142
 msgid "Most answered questions are shown first."
 msgstr "Preguntas más respondidas aparecen primero."
 
-#: templates/questions.html:145
+#: templates/questions.html:146
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>."
 
-#: templates/questions.html:146
+#: templates/questions.html:147
 msgid "Most voted questions are shown first."
 msgstr "Las preguntas más votadas son mostradas primero."
 
-#: templates/questions.html:153 templates/unanswered.html:102
+#: templates/questions.html:154 templates/unanswered.html:102
 msgid "Related tags"
 msgstr "Etiquetas relacionadas"
 
@@ -2023,10 +2061,6 @@ msgstr "Todas las etiquetas que coincidan con la busqueda"
 msgid "all tags - make this empty in english"
 msgstr "todas las tags"
 
-#: templates/tags.html:42
-msgid "Nothing found"
-msgstr "Nada encontrado"
-
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
 msgid "Unanswered questions"
 msgstr "Preguntas sin respuesta"
@@ -2262,7 +2296,7 @@ msgid "Your new Email"
 msgstr "Tu nuevo Email"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:137
 msgid "Password"
 msgstr "Contraseña"
 
@@ -2370,7 +2404,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:120
+#: templates/authopenid/sendpw.html:16 templates/authopenid/signin.html:121
 msgid "Sorry, looks like we have some errors:"
 msgstr "Ups, parece que hay errores:"
 
@@ -2402,7 +2436,7 @@ msgstr "contraseña"
 msgid "Register"
 msgstr "Registrarse"
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:139
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
@@ -2546,7 +2580,7 @@ msgstr ""
 "Ingresa tu dirección (URL) de <a class=\"openid_logo\" href=\"http://openid."
 "net\">OpenID</a>"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:138
 msgid "Login"
 msgstr "Ingresar"
 
@@ -2554,48 +2588,48 @@ msgstr "Ingresar"
 msgid "we support two login modes"
 msgstr "soportamos dos tipos de ingreso"
 
-#: templates/authopenid/signin.html:134
+#: templates/authopenid/signin.html:135
 msgid "Use login name and password"
 msgstr "Nombre de usuario y contraseña"
 
-#: templates/authopenid/signin.html:135
+#: templates/authopenid/signin.html:136
 msgid "Login name"
 msgstr "Nombre de usuario"
 
-#: templates/authopenid/signin.html:139
+#: templates/authopenid/signin.html:140
 msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-#: templates/authopenid/signin.html:148
+#: templates/authopenid/signin.html:149
 msgid "Why use OpenID?"
 msgstr "¿Porqué usar OpenID?"
 
-#: templates/authopenid/signin.html:151
+#: templates/authopenid/signin.html:152
 msgid "with openid it is easier"
 msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña."
 
-#: templates/authopenid/signin.html:154
+#: templates/authopenid/signin.html:155
 msgid "reuse openid"
 msgstr ""
 "Puedes de forma segura re-usar el mismo nombre de usuario para todos los "
 "sitios que acepten OpenID."
 
-#: templates/authopenid/signin.html:157
+#: templates/authopenid/signin.html:158
 msgid "openid is widely adopted"
 msgstr ""
 "OpenID es extensamente usado. Hay más de 160,000,000 cuentas de OpenID en "
 "uso en el mundo. Mas de 10,000 sitios aceptan OpenID."
 
-#: templates/authopenid/signin.html:160
+#: templates/authopenid/signin.html:161
 msgid "openid is supported open standard"
 msgstr ""
 "OpenID es basado en un standard abierto, apoyado por muchas organizaciones."
 
-#: templates/authopenid/signin.html:165
+#: templates/authopenid/signin.html:166
 msgid "Find out more"
 msgstr "Averigua más"
 
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:167
 msgid "Get OpenID"
 msgstr "Adquiere una OpenID"
 
@@ -2639,15 +2673,9 @@ msgstr "Registrate con tu OpenID"
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
-#~ 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"
-
-#~ msgid "close date %(question.closed_at)s"
-#~ msgstr "fecha de cerrada %(question.closed_at)s"
+#, fuzzy
+#~ msgid "complete list of quesionts"
+#~ msgstr "lista completa de preguntas"
 
 #~ msgid "votes total"
 #~ msgstr "votos totales"
-- 
cgit v1.2.3-1-g7c22


From 7e4f1d542e00b4d3121da6ae5524e95867f2371b Mon Sep 17 00:00:00 2001
From: root <root@u15356270.onlinehome-server.com>
Date: Fri, 13 Nov 2009 20:18:55 -0500
Subject: better comments, email subscriptions, corrected view counter, some
 ie7 issues, wiki optional with settings.WIKI_ON, site can be mounted on
 arbitrary url prefix, english language improvements, added feedback form,
 versioned css and js files to force browser cache reload when
 settings.RESOURCE_REVISION is incremented , other fixes

---
 locale/en/LC_MESSAGES/django.mo |  Bin 15146 -> 25611 bytes
 locale/en/LC_MESSAGES/django.po | 2067 ++++++++++++++++++++++++---------------
 locale/es/LC_MESSAGES/django.mo |  Bin 49819 -> 49713 bytes
 locale/es/LC_MESSAGES/django.po |  497 +++++-----
 4 files changed, 1550 insertions(+), 1014 deletions(-)

(limited to 'locale')

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index cd8de560..502c1075 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 b5e5c549..18eb61b1 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-19 00:41+0000\n"
+"POT-Creation-Date: 2009-11-10 19:00-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,339 +16,315 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699
-msgid "account/"
-msgstr ""
-
-#: 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:305 forum/views.py:700
-#: 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 ""
+#: django_authopenid/forms.py:70
+msgid "choose a username"
+msgstr "Choose screen name"
 
-#: urls.py:32
-msgid "privacy/"
+#: django_authopenid/forms.py:76
+msgid "user name is required"
 msgstr ""
 
-#: urls.py:33
-msgid "logout/"
+#: django_authopenid/forms.py:77
+msgid "sorry, this name is taken, please choose another"
 msgstr ""
 
-#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
-msgid "answers/"
+#: django_authopenid/forms.py:78
+msgid "sorry, this name is not allowed, please choose another"
 msgstr ""
 
-#: urls.py:34 urls.py:46
-msgid "comments/"
+#: django_authopenid/forms.py:79
+msgid "sorry, there is no user with this name"
 msgstr ""
 
-#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
-msgid "edit/"
+#: django_authopenid/forms.py:80
+msgid "sorry, we have a serious error - user name is taken by several users"
 msgstr ""
 
-#: urls.py:36 urls.py:45
-msgid "revisions/"
+#: django_authopenid/forms.py:81
+msgid "user name can only consist of letters, empty space and underscore"
 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:1188 forum/views.py:1190
-#: forum/views.py:1430
-msgid "questions/"
-msgstr ""
+#: django_authopenid/forms.py:116
+msgid "your email address"
+msgstr "Your email <i>(never shared)</i>"
 
-#: urls.py:38 urls.py:64
-msgid "ask/"
+#: django_authopenid/forms.py:117
+msgid "email address is required"
 msgstr ""
 
-#: urls.py:39
-msgid "unanswered/"
+#: django_authopenid/forms.py:118
+msgid "please enter a valid email address"
 msgstr ""
 
-#: urls.py:41
-msgid "close/"
+#: django_authopenid/forms.py:119
+msgid "this email is already used by someone else, please choose another"
 msgstr ""
 
-#: urls.py:42
-msgid "reopen/"
+#: django_authopenid/forms.py:163 django_authopenid/views.py:117
+msgid "i-names are not supported"
 msgstr ""
 
-#: urls.py:43
-msgid "answer/"
+#: django_authopenid/forms.py:239
+msgid "Please enter valid username and password (both are case-sensitive)."
 msgstr ""
 
-#: urls.py:44
-msgid "vote/"
+#: django_authopenid/forms.py:242 django_authopenid/forms.py:292
+msgid "This account is inactive."
 msgstr ""
 
-#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
-msgid "delete/"
+#: django_authopenid/forms.py:244
+msgid "Login failed."
 msgstr ""
 
-#: urls.py:50
-msgid "question/"
+#: django_authopenid/forms.py:246
+msgid "Please enter username and password"
 msgstr ""
 
-#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2027
-msgid "tags/"
+#: django_authopenid/forms.py:248
+msgid "Please enter your password"
 msgstr ""
 
-#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998
-#: forum/views.py:1432 forum/views.py:1765 forum/views.py:2029
-msgid "users/"
+#: django_authopenid/forms.py:250
+msgid "Please enter user name"
 msgstr ""
 
-#: urls.py:56 urls.py:57
-msgid "badges/"
+#: django_authopenid/forms.py:288
+msgid ""
+"Please enter a valid                     username and password. Note that "
+"both fields are                     case-sensitive."
 msgstr ""
 
-#: urls.py:58
-msgid "messages/"
-msgstr ""
+#: django_authopenid/forms.py:310
+msgid "choose password"
+msgstr "Password"
 
-#: urls.py:58
-msgid "markread/"
+#: django_authopenid/forms.py:311
+msgid "password is required"
 msgstr ""
 
-#: urls.py:60
-msgid "nimda/"
-msgstr ""
+#: django_authopenid/forms.py:314
+msgid "retype password"
+msgstr "Password <i>(please retype)</i>"
 
-#: urls.py:62
-msgid "upload/"
+#: django_authopenid/forms.py:315
+msgid "please, retype your password"
 msgstr ""
 
-#: urls.py:63 urls.py:64 urls.py:65
-msgid "books/"
+#: django_authopenid/forms.py:316
+msgid "sorry, entered passwords did not match, please try again"
 msgstr ""
 
-#: urls.py:66
-msgid "search/"
+#: django_authopenid/forms.py:341
+msgid "Current password"
 msgstr ""
 
-#: django_authopenid/forms.py:67 django_authopenid/views.py:102
-msgid "i-names are not supported"
+#: django_authopenid/forms.py:343
+msgid "New password"
 msgstr ""
 
-#: django_authopenid/forms.py:102
-msgid ""
-"Usernames can only contain                     letters, numbers and "
-"underscores"
+#: django_authopenid/forms.py:345
+msgid "Retype new password"
 msgstr ""
 
-#: django_authopenid/forms.py:109
+#: django_authopenid/forms.py:356
 msgid ""
-"This username does not exist                     in our database. Please "
-"choose another."
+"Old password is incorrect.                     Please enter the correct "
+"password."
 msgstr ""
 
-#: django_authopenid/forms.py:126 django_authopenid/forms.py:233
-msgid ""
-"Please enter a valid                     username and password. Note that "
-"both fields are                     case-sensitive."
+#: django_authopenid/forms.py:368
+msgid "new passwords do not match"
 msgstr ""
 
-#: django_authopenid/forms.py:130 django_authopenid/forms.py:237
-msgid "This account is inactive."
+#: django_authopenid/forms.py:432
+msgid "Your user name (<i>required</i>)"
 msgstr ""
 
-#: django_authopenid/forms.py:158 django_authopenid/forms.py:210
-msgid "invalid user name"
-msgstr "User names can contain letters, underscore and empty space."
-
-#: django_authopenid/forms.py:160
-msgid "sorry, this name can not be used, please try another"
-msgstr ""
+#: django_authopenid/forms.py:447
+msgid "Incorrect username."
+msgstr "sorry, there is no such user name"
 
-#: django_authopenid/forms.py:162
-msgid "username too short"
+#: django_authopenid/urls.py:9 django_authopenid/urls.py:10
+#: django_authopenid/urls.py:11 django_authopenid/urls.py:13 forum/urls.py:24
+msgid "signin/"
 msgstr ""
 
-#: django_authopenid/forms.py:170 django_authopenid/forms.py:171
-msgid "this name is already in use - please try anoter"
+#: django_authopenid/urls.py:10
+msgid "newquestion/"
 msgstr ""
 
-#: django_authopenid/forms.py:185
-msgid ""
-"This email is already                         registered in our database. "
-"Please choose another."
+#: django_authopenid/urls.py:11
+msgid "newanswer/"
 msgstr ""
 
-#: django_authopenid/forms.py:216
-msgid ""
-"This username don't exist.                         Please choose another."
+#: django_authopenid/urls.py:12
+msgid "signout/"
 msgstr ""
 
-#: django_authopenid/forms.py:255
-msgid "choose a username"
+#: django_authopenid/urls.py:13
+msgid "complete/"
 msgstr ""
 
-#: django_authopenid/forms.py:257 templates/authopenid/signup.html:38
-msgid "your email address"
-msgstr ""
+#: django_authopenid/urls.py:15
+msgid "external-login/"
+msgstr "using-nmr-wiki-login-and-password/"
 
-#: django_authopenid/forms.py:259 templates/authopenid/signup.html:39
-msgid "choose password"
+#: django_authopenid/urls.py:16
+msgid "register/"
 msgstr ""
 
-#: django_authopenid/forms.py:261 templates/authopenid/signup.html:40
-msgid "retype password"
+#: django_authopenid/urls.py:17
+msgid "signup/"
 msgstr ""
 
-#: django_authopenid/forms.py:335
-msgid ""
-"Old password is incorrect.                     Please enter the correct "
-"password."
+#: django_authopenid/urls.py:19
+msgid "sendpw/"
 msgstr ""
 
-#: django_authopenid/forms.py:347
-msgid "new passwords do not match"
+#: django_authopenid/urls.py:20 django_authopenid/urls.py:24
+msgid "password/"
 msgstr ""
 
-#: django_authopenid/forms.py:442
-msgid "Incorrect username."
+#: django_authopenid/urls.py:20
+msgid "confirm/"
 msgstr ""
 
-#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700
-msgid "newquestion/"
+#: django_authopenid/urls.py:23
+msgid "account_settings"
 msgstr ""
 
-#: django_authopenid/urls.py:11
-msgid "newanswer/"
+#: django_authopenid/urls.py:25 django_authopenid/urls.py:26
+#: django_authopenid/urls.py:27 django_authopenid/urls.py:28
+msgid "email/"
 msgstr ""
 
-#: django_authopenid/urls.py:12
-msgid "signout/"
+#: django_authopenid/urls.py:25
+msgid "validate/"
 msgstr ""
 
-#: django_authopenid/urls.py:13
-msgid "complete/"
+#: django_authopenid/urls.py:26
+msgid "change/"
 msgstr ""
 
-#: django_authopenid/urls.py:15
-msgid "register/"
+#: django_authopenid/urls.py:27
+msgid "sendkey/"
 msgstr ""
 
-#: django_authopenid/urls.py:16
-msgid "signup/"
+#: django_authopenid/urls.py:28
+msgid "verify/"
 msgstr ""
 
-#: django_authopenid/urls.py:18
-msgid "sendpw/"
+#: django_authopenid/urls.py:29
+msgid "openid/"
 msgstr ""
 
-#: django_authopenid/urls.py:27
-msgid "validate/"
+#: django_authopenid/urls.py:30 forum/urls.py:43 forum/urls.py:47
+msgid "delete/"
 msgstr ""
 
-#: django_authopenid/views.py:108
+#: django_authopenid/views.py:123
 #, python-format
 msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:418 django_authopenid/views.py:545
-msgid "Welcome"
-msgstr "Verification Email from Q&amp;A forum"
+#: django_authopenid/views.py:531
+msgid "Welcome email subject line"
+msgstr "Welcome to the Q&A forum"
 
-#: django_authopenid/views.py:508
+#: django_authopenid/views.py:626
 msgid "Password changed."
 msgstr ""
 
-#: django_authopenid/views.py:520 django_authopenid/views.py:525
-msgid "your email needs to be validated"
+#: django_authopenid/views.py:638 django_authopenid/views.py:644
+#, python-format
+msgid "your email needs to be validated see %(details_url)s"
 msgstr ""
 "Your email needs to be validated. Please see details <a "
-"id='validate_email_alert' href=\"/faq#validate\">here</a>."
+"id='validate_email_alert' href='%(details_url)s'>here</a>."
+
+#: django_authopenid/views.py:665
+msgid "Email verification subject line"
+msgstr "Verification Email from Q&A forum"
+
+#: django_authopenid/views.py:751
+msgid "your email was not changed"
+msgstr ""
 
-#: django_authopenid/views.py:682 django_authopenid/views.py:834
+#: django_authopenid/views.py:798 django_authopenid/views.py:950
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr ""
 
-#: django_authopenid/views.py:686 django_authopenid/views.py:841
+#: django_authopenid/views.py:802 django_authopenid/views.py:957
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr ""
 
-#: django_authopenid/views.py:694
+#: django_authopenid/views.py:810
 msgid "Email Changed."
 msgstr ""
 
-#: django_authopenid/views.py:769
+#: django_authopenid/views.py:885
 msgid "This OpenID is already associated with another account."
 msgstr ""
 
-#: django_authopenid/views.py:774
+#: django_authopenid/views.py:890
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr ""
 
-#: django_authopenid/views.py:844
+#: django_authopenid/views.py:960
 msgid "Account deleted."
 msgstr ""
 
-#: django_authopenid/views.py:884
+#: django_authopenid/views.py:1003
 msgid "Request for new password"
 msgstr ""
 
-#: django_authopenid/views.py:897
-msgid "A new password has been sent to your email address."
+#: django_authopenid/views.py:1016
+msgid "A new password and the activation link were sent to your email address."
 msgstr ""
 
-#: django_authopenid/views.py:927
+#: django_authopenid/views.py:1046
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
 "registered."
 msgstr ""
 
-#: django_authopenid/views.py:936
+#: django_authopenid/views.py:1055
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
 msgstr ""
 
-#: django_authopenid/views.py:945
+#: django_authopenid/views.py:1064
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr ""
 
+#: forum/auth.py:484
+msgid "Your question and all of it's answers have been deleted"
+msgstr ""
+
+#: forum/auth.py:486
+msgid "Your question has been deleted"
+msgstr ""
+
+#: forum/auth.py:489
+msgid "The question and all of it's answers have been deleted"
+msgstr ""
+
+#: forum/auth.py:491
+msgid "The question has been deleted"
+msgstr ""
+
 #: forum/const.py:8
 msgid "duplicate question"
 msgstr ""
 
 #: forum/const.py:9
-msgid "question if off-topic or not relevant"
+msgid "question is off-topic or not relevant"
 msgstr ""
 
 #: forum/const.py:10
@@ -467,151 +443,336 @@ msgstr ""
 msgid "latest questions"
 msgstr ""
 
-#: 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
+#: forum/feed.py:19 forum/urls.py:32 forum/urls.py:33 forum/urls.py:34
+#: forum/urls.py:35 forum/urls.py:36 forum/urls.py:37 forum/urls.py:38
+#: forum/urls.py:39 forum/urls.py:40 forum/urls.py:41 forum/urls.py:43
+msgid "questions/"
+msgstr ""
+
+#: forum/forms.py:16 templates/answer_edit_tips.html:35
+#: templates/answer_edit_tips.html.py:39 templates/question_edit_tips.html:32
+#: templates/question_edit_tips.html:37
 msgid "title"
 msgstr ""
 
-#: forum/forms.py:15
+#: forum/forms.py:17
 msgid "please enter a descriptive title for your question"
 msgstr ""
 
-#: forum/forms.py:20
+#: forum/forms.py:22
 msgid "title must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:29
+#: forum/forms.py:31
 msgid "content"
 msgstr ""
 
-#: forum/forms.py:35
+#: forum/forms.py:37
 msgid "question content must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:45 templates/header.html:30 templates/header.html.py:64
+#: forum/forms.py:47 templates/header.html:29 templates/header.html.py:63
 msgid "tags"
 msgstr ""
 
-#: forum/forms.py:47
+#: forum/forms.py:49
 msgid ""
 "Tags are short keywords, with no spaces within. Up to five tags can be used."
 msgstr ""
 
-#: forum/forms.py:54 templates/question_retag.html:38
+#: forum/forms.py:56 templates/question_retag.html:39
 msgid "tags are required"
 msgstr ""
 
-#: forum/forms.py:58
+#: forum/forms.py:62
 msgid "please use 5 tags or less"
 msgstr ""
 
-#: forum/forms.py:61
+#: forum/forms.py:65
 msgid "tags must be shorter than 20 characters"
 msgstr ""
 
-#: forum/forms.py:65
+#: forum/forms.py:69
 msgid ""
 "please use following characters in tags: letters 'a-z', numbers, and "
 "characters '.-_#'"
 msgstr ""
 
-#: 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
+#: forum/forms.py:79 templates/index.html:59 templates/index.html.py:71
+#: templates/post_contributor_info.html:7
+#: templates/question_summary_list_roll.html:26
+#: templates/question_summary_list_roll.html:38 templates/questions.html:59
+#: templates/questions.html.py:71 templates/unanswered.html:51
+#: templates/unanswered.html.py:63
 msgid "community wiki"
 msgstr ""
 
-#: forum/forms.py:76
+#: forum/forms.py:80
 msgid ""
 "if you choose community wiki option, the question and answer do not generate "
 "points and name of author will not be shown"
 msgstr ""
 
-#: forum/forms.py:89
+#: forum/forms.py:96
 msgid "update summary:"
 msgstr ""
 
-#: forum/forms.py:90
+#: forum/forms.py:97
 msgid ""
 "enter a brief summary of your revision (e.g. fixed spelling, grammar, "
 "improved style, this field is optional)"
 msgstr ""
 
-#: forum/forms.py:175
+#: forum/forms.py:100
+msgid "Automatically accept user's contributions for the email updates"
+msgstr ""
+
+#: forum/forms.py:113
+msgid "Your name:"
+msgstr ""
+
+#: forum/forms.py:114
+msgid "Email (not shared with anyone):"
+msgstr ""
+
+#: forum/forms.py:115
+msgid "Your message:"
+msgstr ""
+
+#: forum/forms.py:197
 msgid "this email does not have to be linked to gravatar"
 msgstr ""
 
-#: forum/forms.py:176
+#: forum/forms.py:198
 msgid "Real name"
 msgstr ""
 
-#: forum/forms.py:177
+#: forum/forms.py:199
 msgid "Website"
 msgstr ""
 
-#: forum/forms.py:178
+#: forum/forms.py:200
 msgid "Location"
 msgstr ""
 
-#: forum/forms.py:179
+#: forum/forms.py:201
 msgid "Date of birth"
 msgstr ""
 
-#: forum/forms.py:179
+#: forum/forms.py:201
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr ""
 
-#: forum/forms.py:180 templates/authopenid/settings.html:21
+#: forum/forms.py:202 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr ""
 
-#: forum/forms.py:207 forum/forms.py:208
+#: forum/forms.py:229 forum/forms.py:230
 msgid "this email has already been registered, please use another one"
 msgstr ""
 
-#: forum/models.py:246
+#: forum/forms.py:234 forum/forms.py:235
+msgid "weekly"
+msgstr ""
+
+#: forum/forms.py:234 forum/forms.py:235
+msgid "no email"
+msgstr ""
+
+#: forum/forms.py:235
+msgid "daily"
+msgstr ""
+
+#: forum/forms.py:250 forum/models.py:46
+msgid "Entire forum"
+msgstr ""
+
+#: forum/forms.py:253
+msgid "Asked by me"
+msgstr ""
+
+#: forum/forms.py:256
+msgid "Answered by me"
+msgstr ""
+
+#: forum/forms.py:259
+msgid "Individually selected"
+msgstr ""
+
+#: forum/models.py:47
+msgid "Questions that I asked"
+msgstr ""
+
+#: forum/models.py:48
+msgid "Questions that I answered"
+msgstr ""
+
+#: forum/models.py:49
+msgid "Individually selected questions"
+msgstr ""
+
+#: forum/models.py:52
+msgid "Weekly"
+msgstr ""
+
+#: forum/models.py:53
+msgid "Daily"
+msgstr ""
+
+#: forum/models.py:54
+msgid "No email"
+msgstr ""
+
+#: forum/models.py:289
 #, python-format
 msgid "%(author)s modified the question"
 msgstr ""
 
-#: forum/models.py:250
+#: forum/models.py:293
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr ""
 
-#: forum/models.py:255
+#: forum/models.py:298
 #, python-format
 msgid "%(people)s commented the question"
 msgstr ""
 
-#: forum/models.py:260
+#: forum/models.py:303
 #, python-format
 msgid "%(people)s commented answers"
 msgstr ""
 
-#: forum/models.py:262
+#: forum/models.py:305
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr ""
 
-#: forum/models.py:306 forum/models.py:418
-msgid "revisions"
-msgstr ""
-
-#: forum/models.py:441 templates/badges.html:51
+#: forum/models.py:493 templates/badges.html:53
 msgid "gold"
 msgstr ""
 
-#: forum/models.py:442 templates/badges.html:59
+#: forum/models.py:494 templates/badges.html:61
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:443 templates/badges.html:66
+#: forum/models.py:495 templates/badges.html:68
 msgid "bronze"
 msgstr ""
 
+#: forum/urls.py:21
+msgid "upfiles/"
+msgstr ""
+
+#: forum/urls.py:25
+msgid "about/"
+msgstr ""
+
+#: forum/urls.py:26
+msgid "faq/"
+msgstr ""
+
+#: forum/urls.py:27
+msgid "privacy/"
+msgstr ""
+
+#: forum/urls.py:28
+msgid "logout/"
+msgstr ""
+
+#: forum/urls.py:29 forum/urls.py:30 forum/urls.py:31 forum/urls.py:47
+msgid "answers/"
+msgstr ""
+
+#: forum/urls.py:29 forum/urls.py:41 forum/urls.py:43 forum/urls.py:47
+msgid "comments/"
+msgstr ""
+
+#: forum/urls.py:30 forum/urls.py:35 forum/urls.py:56
+#: templates/user_info.html:45
+msgid "edit/"
+msgstr ""
+
+#: forum/urls.py:31 forum/urls.py:40
+msgid "revisions/"
+msgstr ""
+
+#: forum/urls.py:33 forum/urls.py:66
+msgid "ask/"
+msgstr ""
+
+#: forum/urls.py:34
+msgid "unanswered/"
+msgstr ""
+
+#: forum/urls.py:36
+msgid "close/"
+msgstr ""
+
+#: forum/urls.py:37
+msgid "reopen/"
+msgstr ""
+
+#: forum/urls.py:38
+msgid "answer/"
+msgstr ""
+
+#: forum/urls.py:39
+msgid "vote/"
+msgstr ""
+
+#: forum/urls.py:51
+msgid "question/"
+msgstr ""
+
+#: forum/urls.py:52 forum/urls.py:53
+msgid "tags/"
+msgstr ""
+
+#: forum/urls.py:54 forum/urls.py:56 forum/urls.py:57
+msgid "users/"
+msgstr ""
+
+#: forum/urls.py:55
+msgid "moderate-user/"
+msgstr ""
+
+#: forum/urls.py:58 forum/urls.py:59
+msgid "badges/"
+msgstr ""
+
+#: forum/urls.py:60
+msgid "messages/"
+msgstr ""
+
+#: forum/urls.py:60
+msgid "markread/"
+msgstr ""
+
+#: forum/urls.py:62
+msgid "nimda/"
+msgstr ""
+
+#: forum/urls.py:64
+msgid "upload/"
+msgstr ""
+
+#: forum/urls.py:65 forum/urls.py:66 forum/urls.py:67
+msgid "books/"
+msgstr ""
+
+#: forum/urls.py:68
+msgid "search/"
+msgstr ""
+
+#: forum/urls.py:69
+msgid "feedback/"
+msgstr ""
+
+#: forum/urls.py:70
+msgid "account/"
+msgstr ""
+
 #: forum/user.py:16 templates/user_tabs.html:7
 msgid "overview"
 msgstr ""
@@ -648,17 +809,17 @@ msgstr ""
 msgid "profile - responses"
 msgstr ""
 
-#: forum/user.py:42 templates/user_info.html:23 templates/users.html:26
+#: forum/user.py:42 templates/user_info.html:22 templates/users.html:26
 msgid "reputation"
-msgstr ""
+msgstr "karma"
 
 #: forum/user.py:43
 msgid "user reputation in the community"
-msgstr ""
+msgstr "user karma"
 
 #: forum/user.py:44
 msgid "profile - user reputation"
-msgstr ""
+msgstr "Profile - User's Karma"
 
 #: forum/user.py:50
 msgid "favorite questions"
@@ -684,61 +845,130 @@ msgstr ""
 msgid "profile - votes"
 msgstr ""
 
-#: forum/user.py:68
-msgid "preferences"
+#: forum/user.py:68 templates/user_tabs.html:28
+msgid "email subscriptions"
 msgstr ""
 
 #: forum/user.py:69 templates/user_tabs.html:27
-msgid "user preference settings"
+msgid "email subscription settings"
 msgstr ""
 
 #: forum/user.py:70
-msgid "profile - user preferences"
+msgid "profile - email subscriptions"
 msgstr ""
 
-#: forum/views.py:948
+#: forum/views.py:126
+msgid "Q&A forum feedback"
+msgstr ""
+
+#: forum/views.py:127
+msgid "Thanks for the feedback!"
+msgstr ""
+
+#: forum/views.py:135
+msgid "We look forward to hearing your feedback! Please, give it next time :)"
+msgstr ""
+
+#: forum/views.py:1014
 #, python-format
-msgid "subscription saved, %(email)s needs validation"
+msgid "subscription saved, %(email)s needs validation, see %(details_url)s"
 msgstr ""
 "Your subscription is saved, but email address %(email)s needs to be "
-"validated, please see <a href='/faq#validate'>more details here</a>"
+"validated, please see <a href='%(details_url)s'>more details here</a>"
 
-#: forum/views.py:1874
-msgid "uploading images is limited to users with >60 reputation points"
+#: forum/views.py:1022
+msgid "email update frequency has been set to daily"
 msgstr ""
 
-#: forum/views.py:1876
+#: forum/views.py:1826
+msgid "changes saved"
+msgstr ""
+
+#: forum/views.py:1832
+msgid "email updates canceled"
+msgstr ""
+
+#: forum/views.py:1999
+msgid "uploading images is limited to users with >60 reputation points"
+msgstr "sorry, file uploading requires karma >60"
+
+#: forum/views.py:2001
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:1878
+#: forum/views.py:2003
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:1880
+#: forum/views.py:2005
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
 msgstr ""
 
-#: forum/management/commands/send_email_alerts.py:35
-msgid "updates from website"
-msgstr "Q&amp;A forum update"
+#: forum/management/commands/send_email_alerts.py:71
+msgid "email update message subject"
+msgstr "news from Q&A forum"
 
-#: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172
-#: templates/header.html:35
+#: forum/management/commands/send_email_alerts.py:72
+#, python-format
+msgid "%(name)s, this is an update message header for a question"
+msgid_plural "%(name)s, this is an update message header for %(num)d questions"
+msgstr[0] "<p>Dear %(name)s,</p></p>The following question has been updated on the Q&A forum:</p>"
+msgstr[1] "<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on the Q&A forum:</p>"
+
+#: forum/management/commands/send_email_alerts.py:81
+#, python-format
+msgid ""
+"go to %(link)s to change frequency of email updates or %(email)s "
+"administrator"
+msgstr ""
+"<p>Please remember that you can always <a href='%(link)s'>adjust</a> frequency of the "
+"email updates or turn them off entirely.<br/>If you believe that this message "
+"was sent in an error, please email about it the forum administrator at %(email)"
+"s.</p>"
+"<p>Sincerely,</p><p>Your friendly Q&A forum server.</p>"
+
+#: forum/templatetags/extra_tags.py:160 forum/templatetags/extra_tags.py:189
+#: templates/header.html:34
 msgid "badges"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:144 forum/templatetags/extra_tags.py:171
+#: forum/templatetags/extra_tags.py:161 forum/templatetags/extra_tags.py:188
 msgid "reputation points"
+msgstr "karma"
+
+#: forum/templatetags/extra_tags.py:244
+msgid "%b %d at %H:%M"
+msgstr ""
+
+#: forum/templatetags/extra_tags.py:246
+msgid "%b %d '%y at %H:%M"
+msgstr ""
+
+#: forum/templatetags/extra_tags.py:248
+msgid "2 days ago"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:225
-msgid " ago"
+#: forum/templatetags/extra_tags.py:250
+msgid "yesterday"
 msgstr ""
 
+#: forum/templatetags/extra_tags.py:252
+#, python-format
+msgid "%(hr)d hour ago"
+msgid_plural "%(hr)d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: forum/templatetags/extra_tags.py:254
+#, python-format
+msgid "%(min)d min ago"
+msgid_plural "%(min)d mins ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/404.html:24
 msgid "Sorry, could not find the page you requested."
 msgstr ""
@@ -805,55 +1035,55 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-#: templates/answer_edit.html:4 templates/answer_edit.html.py:47
+#: templates/answer_edit.html:5 templates/answer_edit.html.py:48
 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:43
-#: templates/question.html.py:46 templates/question_edit.html:27
+#: templates/answer_edit.html:25 templates/answer_edit.html.py:28
+#: templates/ask.html:26 templates/ask.html.py:29 templates/question.html:45
+#: templates/question.html.py:48 templates/question_edit.html:28
 msgid "hide preview"
 msgstr ""
 
-#: templates/answer_edit.html:27 templates/ask.html:28
-#: templates/question.html:46 templates/question_edit.html:27
+#: templates/answer_edit.html:28 templates/ask.html:29
+#: templates/question.html:48 templates/question_edit.html:28
 msgid "show preview"
 msgstr ""
 
-#: templates/answer_edit.html:47 templates/question_edit.html:65
-#: templates/question_retag.html:52 templates/revisions_answer.html:36
+#: templates/answer_edit.html:48 templates/question_edit.html:66
+#: templates/question_retag.html:53 templates/revisions_answer.html:36
 #: templates/revisions_question.html:36
 msgid "back"
 msgstr ""
 
-#: templates/answer_edit.html:52 templates/question_edit.html:70
-#: templates/revisions_answer.html:47 templates/revisions_question.html:47
+#: templates/answer_edit.html:53 templates/question_edit.html:71
+#: templates/revisions_answer.html:50 templates/revisions_question.html:50
 msgid "revision"
 msgstr ""
 
-#: templates/answer_edit.html:55 templates/question_edit.html:74
+#: templates/answer_edit.html:56 templates/question_edit.html:75
 msgid "select revision"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:467 templates/question_edit.html:91
+#: templates/answer_edit.html:63 templates/ask.html:97
+#: templates/question.html:434 templates/question_edit.html:92
 msgid "Toggle the real time Markdown editor preview"
 msgstr ""
 
-#: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:467 templates/question_edit.html:91
+#: templates/answer_edit.html:63 templates/ask.html:97
+#: templates/question.html:435 templates/question_edit.html:92
 msgid "toggle preview"
 msgstr ""
 
-#: templates/answer_edit.html:71 templates/question_edit.html:115
-#: templates/question_retag.html:73
+#: templates/answer_edit.html:72 templates/question_edit.html:118
+#: templates/question_retag.html:74
 msgid "Save edit"
 msgstr ""
 
-#: 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
+#: templates/answer_edit.html:73 templates/close.html:29
+#: templates/feedback.html:50 templates/question_edit.html:119
+#: templates/question_retag.html:75 templates/reopen.html:30
+#: templates/user_edit.html:83 templates/authopenid/changeemail.html:40
 msgid "Cancel"
 msgstr ""
 
@@ -877,80 +1107,82 @@ msgstr ""
 msgid "be clear and concise"
 msgstr ""
 
-#: templates/answer_edit_tips.html:19 templates/question_edit_tips.html:16
+#: templates/answer_edit_tips.html:20 templates/question_edit_tips.html:17
 msgid "see frequently asked questions"
 msgstr ""
 
-#: templates/answer_edit_tips.html:24 templates/question_edit_tips.html:22
+#: templates/answer_edit_tips.html:26 templates/question_edit_tips.html:23
 msgid "Markdown tips"
 msgstr "Markdown basics"
 
-#: templates/answer_edit_tips.html:27 templates/question_edit_tips.html:25
+#: templates/answer_edit_tips.html:29 templates/question_edit_tips.html:26
 msgid "*italic* or __italic__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:30 templates/question_edit_tips.html:28
+#: templates/answer_edit_tips.html:32 templates/question_edit_tips.html:29
 msgid "**bold** or __bold__"
 msgstr ""
 
-#: templates/answer_edit_tips.html:33 templates/question_edit_tips.html:31
+#: templates/answer_edit_tips.html:35 templates/question_edit_tips.html:32
 msgid "link"
 msgstr ""
 
-#: 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
+#: templates/answer_edit_tips.html:35 templates/answer_edit_tips.html.py:39
+#: templates/question_edit_tips.html:32 templates/question_edit_tips.html:37
 msgid "text"
 msgstr ""
 
-#: templates/answer_edit_tips.html:37 templates/question_edit_tips.html:36
+#: templates/answer_edit_tips.html:39 templates/question_edit_tips.html:37
 msgid "image"
 msgstr ""
 
-#: templates/answer_edit_tips.html:41 templates/question_edit_tips.html:40
+#: templates/answer_edit_tips.html:43 templates/question_edit_tips.html:41
 msgid "numbered list:"
 msgstr ""
 
-#: templates/answer_edit_tips.html:46 templates/question_edit_tips.html:45
+#: templates/answer_edit_tips.html:48 templates/question_edit_tips.html:46
 msgid "basic HTML tags are also supported"
 msgstr ""
 
-#: templates/answer_edit_tips.html:49 templates/question_edit_tips.html:48
+#: templates/answer_edit_tips.html:52 templates/question_edit_tips.html:50
 msgid "learn more about Markdown"
 msgstr ""
 
-#: templates/ask.html:4 templates/ask.html.py:60
+#: templates/ask.html:5 templates/ask.html.py:61
 msgid "Ask a question"
 msgstr ""
 
-#: templates/ask.html:67
+#: templates/ask.html:68
 msgid "login to post question info"
 msgstr ""
 "<span class=\"strong big\">You are welcome to start submitting your question "
-"anonymously</span>  - you are currently not logged in. When you post your "
-"question, you will be redirected to the login/signup page. Your question "
-"will be saved meanwhile  and will be posted when you log in. Login/signup "
-"process is very simple. Login takes about 30 seconds, initial signup takes a "
-"minute or less."
+"anonymously</span>. When you submit the post, you will be redirected to the "
+"login/signup page. Your question will be saved in the current session and "
+"will be published after you log in. Login/signup process is very simple. "
+"Login takes about 30 seconds, initial signup takes a minute or less."
 
-#: templates/ask.html:73
+#: templates/ask.html:74
 #, python-format
-msgid "must have valid %(email)s to post"
+msgid ""
+"must have valid %(email)s to post, \n"
+"                            see %(email_validation_faq_url)s\n"
+"                            "
 msgstr ""
 "<span class='strong big'>Looks like your email address, %(email)s has not "
 "yet been validated.</span> To post messages you must verify your email, "
-"please see <a href='/faq#validate'>more details here</a>.<br>You can submit "
-"your question now and validate email after that. Your question will saved as "
-"pending meanwhile. "
+"please see <a href='%(email_validation_faq_url)s'>more details here</a>."
+"<br>You can submit your question now and validate email after that. Your "
+"question will saved as pending meanwhile. "
 
-#: templates/ask.html:107
+#: templates/ask.html:112
 msgid "(required)"
 msgstr ""
 
-#: templates/ask.html:114
+#: templates/ask.html:119
 msgid "Login/signup to post your question"
 msgstr "Login/Signup to Post"
 
-#: templates/ask.html:116
+#: templates/ask.html:121
 msgid "Ask your question"
 msgstr "Ask Your Question"
 
@@ -966,7 +1198,7 @@ msgstr ""
 msgid "Badges summary"
 msgstr ""
 
-#: templates/badges.html:17 templates/user_stats.html:73
+#: templates/badges.html:17
 msgid "Badges"
 msgstr ""
 
@@ -977,38 +1209,41 @@ msgstr ""
 "Q&amp;A community will be recognized with the variety of badges."
 
 #: templates/badges.html:22
+#, python-format
 msgid ""
-"Below is the list of available badges and number of times each type of badge "
-"has been awarded."
+"Below is the list of available badges and number \n"
+"    of times each type of badge has been awarded. Give us feedback at %"
+"(feedback_faq_url)s.\n"
+"    "
 msgstr ""
 "Currently badges differ only by their level: <strong>gold</strong>, "
 "<strong>silver</strong> and <strong>bronze</strong> (their meanings are "
 "described on the right). In the future there will be many types of badges at "
-"each level. <strong>Please give us your <a href=\"/faq#feedback\">feedback</"
-"a></strong> - what kinds of badges would you like to see and suggest the "
-"activity for which those badges might be awarded."
+"each level. <strong>Please give us your <a href='%(feedback_faq_url)"
+"s'>feedback</a></strong> - what kinds of badges would you like to see and "
+"suggest the activity for which those badges might be awarded."
 
-#: templates/badges.html:48
+#: templates/badges.html:50
 msgid "Community badges"
 msgstr "Badge levels"
 
-#: templates/badges.html:54
+#: templates/badges.html:56
 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:62
+#: templates/badges.html:64
 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:65
+#: templates/badges.html:67
 msgid "bronze badge: often given as a special honor"
 msgstr ""
 
-#: templates/badges.html:69
+#: templates/badges.html:71
 msgid "bronze badge description"
 msgstr ""
 "If you are an active participant in this community, you will be recognized "
@@ -1080,8 +1315,9 @@ msgstr ""
 msgid "number of times"
 msgstr ""
 
-#: templates/book.html:105 templates/index.html:48 templates/questions.html:46
-#: templates/unanswered.html:37 templates/users_questions.html:32
+#: templates/book.html:105 templates/index.html:47
+#: templates/question_summary_list_roll.html:14 templates/questions.html:47
+#: templates/unanswered.html:39 templates/users_questions.html:32
 msgid "votes"
 msgstr ""
 
@@ -1089,15 +1325,17 @@ msgstr ""
 msgid "the answer has been accepted to be correct"
 msgstr ""
 
-#: templates/book.html:115 templates/index.html:49 templates/questions.html:47
-#: templates/unanswered.html:38 templates/users_questions.html:42
+#: templates/book.html:115 templates/index.html:48
+#: templates/question_summary_list_roll.html:15 templates/questions.html:48
+#: templates/unanswered.html:40 templates/users_questions.html:40
 msgid "views"
 msgstr ""
 
-#: 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:54
+#: templates/book.html:125 templates/index.html:103
+#: templates/question.html:480 templates/question_summary_list_roll.html:52
+#: templates/questions.html:103 templates/questions.html.py:171
+#: templates/tags.html:49 templates/unanswered.html:95
+#: templates/unanswered.html.py:122 templates/users_questions.html:52
 msgid "using tags"
 msgstr ""
 
@@ -1105,7 +1343,7 @@ msgstr ""
 msgid "subscribe to book RSS feed"
 msgstr ""
 
-#: templates/book.html:147 templates/index.html:118
+#: templates/book.html:147 templates/index.html:152
 msgid "subscribe to the questions feed"
 msgstr ""
 
@@ -1189,16 +1427,18 @@ msgid ""
 "The reputation system allows users earn the authorization to perform a "
 "variety of moderation tasks."
 msgstr ""
+"Karma system allows users to earn rights to perform a variety of moderation "
+"tasks"
 
 #: templates/faq.html:40
 msgid "How does reputation system work?"
-msgstr ""
+msgstr "How does karma system work?"
 
 #: templates/faq.html:41
 msgid "Rep system summary"
 msgstr ""
 "When a question or answer is upvoted, the user who posted them will gain "
-"some points, which are called \"reputation points\". These points serve as a "
+"some points, which are called \"karma points\". These points serve as a "
 "rough measure of the community trust to him/her. Various moderation tasks "
 "are gradually assigned to the users based on those points."
 
@@ -1237,51 +1477,53 @@ msgstr ""
 msgid "retag questions"
 msgstr ""
 
-#: templates/faq.html:77
+#: templates/faq.html:78
 msgid "edit community wiki questions"
 msgstr ""
 
-#: templates/faq.html:81
+#: templates/faq.html:83
 msgid "edit any answer"
 msgstr ""
 
-#: templates/faq.html:85
+#: templates/faq.html:87
 msgid "open any closed question"
 msgstr ""
 
-#: templates/faq.html:89
+#: templates/faq.html:91
 msgid "delete any comment"
 msgstr ""
 
-#: templates/faq.html:93
+#: templates/faq.html:95
 msgid "delete any questions and answers and perform other moderation tasks"
 msgstr ""
 
-#: templates/faq.html:100
+#: templates/faq.html:102
 msgid "how to validate email title"
 msgstr "How to validate email and why?"
 
-#: templates/faq.html:102
-msgid "how to validate email info"
-msgstr ""
-"<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class="
-"\"bigger strong\">How?</span> If you have just set or changed your email "
-"address - <strong>check your email and click the included link</strong>."
-"<br>The link contains a key generated specifically for you. You can also "
-"<button style='display:inline' type='submit'><strong>get a new key</strong></"
-"button> and check your email again.</p></form><span class=\"bigger strong"
-"\">Why?</span> Email validation is required to make sure that <strong>only "
-"you can post messages</strong> on your behalf and to <strong>minimize spam</"
-"strong> posts.<br>With email you can <strong>subscribe for updates</strong> "
-"on the most interesting questions. Also, when you sign up for the first time "
-"- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> "
-"personal image.</p>"
-
-#: templates/faq.html:106
+#: templates/faq.html:104
+#, python-format
+msgid ""
+"how to validate email info with %(send_email_key_url)s %(gravatar_faq_url)s"
+msgstr ""
+"<form style='margin:0;padding:0;' action='%(send_email_key_url)s'><p><span "
+"class=\"bigger strong\">How?</span> If you have just set or changed your "
+"email address - <strong>check your email and click the included link</"
+"strong>.<br>The link contains a key generated specifically for you. You can "
+"also <button style='display:inline' type='submit'><strong>get a new key</"
+"strong></button> and check your email again.</p></form><span class=\"bigger "
+"strong\">Why?</span> Email validation is required to make sure that "
+"<strong>only you can post messages</strong> on your behalf and to "
+"<strong>minimize spam</strong> posts.<br>With email you can "
+"<strong>subscribe for updates</strong> on the most interesting questions. "
+"Also, when you sign up for the first time - create a unique <a href='%"
+"(gravatar_faq_url)s'><strong>gravatar</strong></a> personal image.</p>"
+
+#: templates/faq.html:108
 msgid "what is gravatar"
 msgstr "What is gravatar?"
 
-#: templates/faq.html:107
+#: templates/faq.html:109
 msgid "gravatar faq info"
 msgstr ""
 "<strong>Gravatar</strong> means <strong>g</strong>lobally <strong>r</"
@@ -1292,63 +1534,124 @@ msgstr ""
 "your image</strong> at <a href='http://gravatar.com'><strong>gravatar.com</"
 "strong></a>"
 
-#: templates/faq.html:110
+#: templates/faq.html:112
 msgid "To register, do I need to create new password?"
 msgstr ""
 
-#: templates/faq.html:111
+#: templates/faq.html:113
 msgid ""
 "No, you don't have to. You can login through any service that supports "
 "OpenID, e.g. Google, Yahoo, AOL, etc."
 msgstr ""
 
-#: templates/faq.html:112
+#: templates/faq.html:114
 msgid "Login now!"
 msgstr ""
 
-#: templates/faq.html:117
+#: templates/faq.html:119
 msgid "Why other people can edit my questions/answers?"
 msgstr ""
 
-#: templates/faq.html:118
+#: templates/faq.html:120
 msgid "Goal of this site is..."
 msgstr ""
 
-#: templates/faq.html:118
+#: templates/faq.html:120
 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 "
 "content."
 msgstr ""
 
-#: templates/faq.html:119
+#: templates/faq.html:121
 msgid "If this approach is not for you, we respect your choice."
 msgstr ""
 
-#: templates/faq.html:123
+#: templates/faq.html:125
 msgid "Still have questions?"
 msgstr ""
 
-#: templates/faq.html:124
-msgid "Please ask your question, help make our community better!"
+#: templates/faq.html:126
+#, python-format
+msgid ""
+"Please ask your question at %(ask_question_url)s, help make our community "
+"better!"
 msgstr ""
-"Please <a href=\"/questions/ask\">ask</a> your question, help make our "
+"Please <a href='%(ask_question_url)s'>ask</a> your question, help make our "
 "community better!"
 
-#: templates/faq.html:126 templates/header.html:29 templates/header.html.py:63
+#: templates/faq.html:128 templates/header.html:28 templates/header.html.py:62
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:126 templates/index.html:123
+#: templates/faq.html:128 templates/index.html:157
 msgid "."
 msgstr ""
 
-#: templates/footer.html:8 templates/header.html:14 templates/index.html:83
+#: templates/feedback.html:6
+msgid "Feedback"
+msgstr ""
+
+#: templates/feedback.html:11
+msgid "Give us your feedback!"
+msgstr ""
+
+#: templates/feedback.html:17
+#, python-format
+msgid ""
+"\n"
+"            <span class='big strong'>Dear %(user_name)s</span>, we look "
+"forward to hearing your feedback. \n"
+"            Please type and send us your message below.\n"
+"            "
+msgstr ""
+
+#: templates/feedback.html:24
+msgid ""
+"\n"
+"            <span class='big strong'>Dear visitor</span>, we look forward to "
+"hearing your feedback.\n"
+"            Please type and send us your message below.\n"
+"            "
+msgstr ""
+
+#: templates/feedback.html:41
+msgid "(this field is required)"
+msgstr ""
+
+#: templates/feedback.html:49
+msgid "Send Feedback"
+msgstr ""
+
+#: templates/feedback_email.txt:3
+#, python-format
+msgid ""
+"\n"
+"Hello, this is a %(site_title)s forum feedback message\n"
+msgstr ""
+
+#: templates/feedback_email.txt:9
+msgid "Sender is"
+msgstr ""
+
+#: templates/feedback_email.txt:11 templates/feedback_email.txt.py:14
+msgid "email"
+msgstr ""
+
+#: templates/feedback_email.txt:13
+msgid "anonymous"
+msgstr ""
+
+#: templates/feedback_email.txt:19
+msgid "Message body:"
+msgstr ""
+
+#: templates/footer.html:8 templates/header.html:14 templates/index.html:117
 msgid "about"
 msgstr ""
 
-#: templates/footer.html:9 templates/header.html:15 templates/index.html:84
-#: templates/question_edit_tips.html:16
+#: templates/footer.html:9 templates/header.html:15 templates/index.html:118
+#: templates/question_edit_tips.html:17
 msgid "faq"
 msgstr ""
 
@@ -1368,162 +1671,176 @@ msgstr ""
 msgid "privacy policy"
 msgstr ""
 
-#: templates/footer.html:14
+#: templates/footer.html:22
 msgid "give feedback"
 msgstr ""
 
-#: templates/header.html:10
+#: templates/header.html:9
 msgid "logout"
 msgstr ""
 
-#: templates/header.html:12 templates/authopenid/signup.html:41
+#: templates/header.html:11
 msgid "login"
 msgstr ""
 
-#: templates/header.html:23
+#: templates/header.html:22
 msgid "back to home page"
 msgstr ""
 
-#: templates/header.html:31 templates/header.html.py:65
+#: templates/header.html:30 templates/header.html.py:64
 msgid "users"
 msgstr ""
 
-#: templates/header.html:33
+#: templates/header.html:32
 msgid "books"
 msgstr ""
 
-#: templates/header.html:36
+#: templates/header.html:35
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:40
+#: templates/header.html:39
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:44
+#: templates/header.html:43
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:59
+#: templates/header.html:58
 msgid "search"
 msgstr ""
 
-#: templates/index.html:7
+#: templates/index.html:8
 msgid "Home"
 msgstr ""
 
-#: templates/index.html:22 templates/questions.html:7
+#: templates/index.html:23 templates/questions.html:8
 msgid "Questions"
 msgstr ""
 
-#: templates/index.html:24
+#: templates/index.html:25
 msgid "last updated questions"
 msgstr ""
 
-#: templates/index.html:24 templates/questions.html:25
-#: templates/unanswered.html:20
+#: templates/index.html:25 templates/questions.html:26
+#: templates/unanswered.html:21
 msgid "newest"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "hottest questions"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:27
+#: templates/index.html:26 templates/questions.html:28
 msgid "hottest"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:27 templates/questions.html:29
 msgid "most voted questions"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:27 templates/questions.html:29
 msgid "most voted"
 msgstr ""
 
-#: templates/index.html:27
+#: templates/index.html:28
 msgid "all questions"
 msgstr ""
 
-#: templates/index.html:47 templates/questions.html:45
-#: templates/unanswered.html:36 templates/users_questions.html:35
+#: templates/index.html:46 templates/question_summary_list_roll.html:13
+#: templates/questions.html:46 templates/unanswered.html:38
+#: templates/users_questions.html:36
 msgid "answers"
 msgstr ""
 
-#: 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
+#: templates/index.html:78 templates/index.html.py:92
+#: templates/questions.html:78 templates/questions.html.py:92
+#: templates/unanswered.html:70 templates/unanswered.html.py:84
+msgid "Posted:"
+msgstr ""
+
+#: templates/index.html:81 templates/index.html.py:86
+#: templates/questions.html:81 templates/questions.html.py:86
+#: templates/unanswered.html:73 templates/unanswered.html.py:78
+msgid "Updated:"
+msgstr ""
+
+#: templates/index.html:103 templates/question.html:480
+#: templates/question_summary_list_roll.html:52 templates/questions.html:103
+#: templates/questions.html.py:171 templates/tags.html:49
+#: templates/unanswered.html:95 templates/unanswered.html.py:122
+#: templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr ""
 
-#: templates/index.html:80
+#: templates/index.html:114
 msgid "welcome to website"
-msgstr ""
+msgstr "Welcome to Q&amp;A forum"
 
-#: templates/index.html:89
+#: templates/index.html:123
 msgid "Recent tags"
 msgstr ""
 
-#: templates/index.html:94 templates/question.html:125
+#: templates/index.html:128 templates/question.html:135
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
-#: templates/index.html:97 templates/index.html.py:123
+#: templates/index.html:131 templates/index.html.py:157
 msgid "popular tags"
 msgstr "tags"
 
-#: templates/index.html:102
+#: templates/index.html:136
 msgid "Recent awards"
 msgstr "Recent badges"
 
-#: templates/index.html:108
+#: templates/index.html:142
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:113
+#: templates/index.html:147
 msgid "all awards"
 msgstr "all badges"
 
-#: templates/index.html:118
+#: templates/index.html:152
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "complete list of questions"
 msgstr "list of all questions"
 
-#: templates/index.html:123
+#: templates/index.html:157 templates/authopenid/signup.html:18
 msgid "or"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "Please help us answer"
 msgstr ""
 
-#: templates/index.html:123
+#: templates/index.html:157
 msgid "list of unanswered questions"
 msgstr "unanswered questions"
 
-#: templates/logout.html:6 templates/logout.html.py:17
+#: templates/logout.html:6 templates/logout.html.py:16
 msgid "Logout"
 msgstr ""
 
-#: templates/logout.html:20
+#: templates/logout.html:19
 msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
-"Clicking <strong>Logout</strong> will log you out from the Q&amp;A forum.</"
-"p><p>If you wish to sign off completely - please make sure to log out from "
-"your OpenID provider."
+"Clicking <strong>Logout</strong> will log you out from the forum"
+"but will not sign you off from your OpenID provider.</p><p>If you wish to sign off "
+"completely - please make sure to log out from your OpenID provider as well."
 
-#: templates/logout.html:21
+#: templates/logout.html:20
 msgid "Logout now"
 msgstr "Logout Now"
 
@@ -1551,6 +1868,33 @@ msgstr ""
 msgid "next page"
 msgstr ""
 
+#: templates/post_contributor_info.html:9
+#, python-format
+msgid ""
+"\n"
+"                one revision\n"
+"            "
+msgid_plural ""
+"\n"
+"                %(rev_count)s revisions\n"
+"            "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/post_contributor_info.html:19 templates/revisions_answer.html:66
+#: templates/revisions_question.html:66
+msgid "asked"
+msgstr ""
+
+#: templates/post_contributor_info.html:21
+msgid "answered"
+msgstr ""
+
+#: templates/post_contributor_info.html:37 templates/revisions_answer.html:68
+#: templates/revisions_question.html:68
+msgid "updated"
+msgstr ""
+
 #: templates/privacy.html:6 templates/privacy.html.py:11
 msgid "Privacy policy"
 msgstr ""
@@ -1558,6 +1902,10 @@ msgstr ""
 #: templates/privacy.html:15
 msgid "general message about privacy"
 msgstr ""
+"Respecting users privacy is an important core principle "
+"of this Q&amp;A forum. "
+"Information on this page details how this forum protects your privacy, "
+"and what type of information is collected."
 
 #: templates/privacy.html:18
 msgid "Site Visitors"
@@ -1566,6 +1914,9 @@ msgstr ""
 #: templates/privacy.html:20
 msgid "what technical information is collected about visitors"
 msgstr ""
+"Information on question views, revisions of questions and answers - both times "
+"and content are recorded for each user in order to correctly count number of views, "
+"maintain data integrity and report relevant updates."
 
 #: templates/privacy.html:23
 msgid "Personal Information"
@@ -1574,6 +1925,9 @@ msgstr ""
 #: templates/privacy.html:25
 msgid "details on personal information policies"
 msgstr ""
+"Members of this community may choose to display personally identifiable information "
+"in their profiles. Forum will never display such information "
+"without a request from the user."
 
 #: templates/privacy.html:28
 msgid "Other Services"
@@ -1582,10 +1936,15 @@ msgstr ""
 #: templates/privacy.html:30
 msgid "details on sharing data with third parties"
 msgstr ""
+"None of the data that is not openly shown on the forum by the choice of the user "
+"is shared with any third party."
 
 #: templates/privacy.html:35
 msgid "cookie policy details"
 msgstr ""
+"Forum software relies on the internet cookie technology to "
+"keep track of user sessions. Cookies must be enabled "
+"in your browser so that forum can work for you."
 
 #: templates/privacy.html:37
 msgid "Policy Changes"
@@ -1594,194 +1953,305 @@ msgstr ""
 #: templates/privacy.html:38
 msgid "how privacy policies can be changed"
 msgstr ""
+"These policies may be adjusted to improve protection of "
+"user's privacy. Whenever such changes occur, users will be "
+"notified via the internal messaging system. "
 
-#: templates/question.html:72 templates/question.html.py:73
-#: templates/question.html:85 templates/question.html.py:87
+#: templates/question.html:77 templates/question.html.py:78
+#: templates/question.html:94 templates/question.html.py:96
 msgid "i like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:75 templates/question.html.py:89
-#: templates/question.html:289
+#: templates/question.html:80 templates/question.html.py:98
+#: templates/question.html:257
 msgid "current number of votes"
 msgstr ""
 
-#: templates/question.html:80 templates/question.html.py:81
-#: templates/question.html:94 templates/question.html.py:95
+#: templates/question.html:89 templates/question.html.py:90
+#: templates/question.html:103 templates/question.html.py:104
 msgid "i dont like this post (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:100 templates/question.html.py:101
+#: templates/question.html:109 templates/question.html.py:110
 msgid "mark this question as favorite (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:107 templates/question.html.py:108
+#: templates/question.html:116 templates/question.html.py:117
 msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 
-#: templates/question.html:134 templates/question.html.py:322
-#: templates/revisions_answer.html:53 templates/revisions_question.html:53
+#: templates/question.html:140 templates/question.html.py:294
+#: templates/revisions_answer.html:56 templates/revisions_question.html:56
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:138 templates/question.html.py:332
+#: templates/question.html:144 templates/question.html.py:301
 msgid "delete"
 msgstr ""
 
-#: templates/question.html:143
+#: templates/question.html:149
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:148
+#: templates/question.html:153
 msgid "close"
 msgstr ""
 
-#: templates/question.html:154 templates/question.html.py:345
+#: templates/question.html:159 templates/question.html.py:308
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 
-#: templates/question.html:155 templates/question.html.py:346
+#: templates/question.html:160 templates/question.html.py:309
 msgid "flag offensive"
 msgstr ""
 
-#: templates/question.html:167 templates/question.html.py:355
-#: templates/revisions_answer.html:65 templates/revisions_question.html:65
-msgid "updated"
+#: templates/question.html:182 templates/question.html.py:331
+msgid "delete this comment"
 msgstr ""
 
-#: templates/question.html:216 templates/question.html.py:402
-#: templates/revisions_answer.html:63 templates/revisions_question.html:63
-msgid "asked"
-msgstr ""
+#: templates/question.html:193 templates/question.html.py:342
+msgid "add comment"
+msgstr "post a comment"
 
-#: templates/question.html:246 templates/question.html.py:429
-msgid "comments"
-msgstr ""
+#: templates/question.html:197
+#, python-format
+msgid ""
+"\n"
+"                                            see <strong>one</strong> more \n"
+"                                            "
+msgid_plural ""
+"\n"
+"                                            see <strong>%(counter)s</strong> "
+"more\n"
+"                                            "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:247 templates/question.html.py:430
-msgid "add comment"
-msgstr ""
+#: templates/question.html:203
+#, python-format
+msgid ""
+"\n"
+"                                            see <strong>one</strong> more "
+"comment\n"
+"                                            "
+msgid_plural ""
+"\n"
+"                                            see <strong>%(counter)s</strong> "
+"more comments\n"
+"                                            "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:260
+#: templates/question.html:219
 #, python-format
 msgid ""
-"The question has been closed for the following reason \"%(question."
-"get_close_reason_display)s\" by"
+"The question has been closed for the following reason \"%(close_reason)s\" by"
 msgstr ""
 
-#: templates/question.html:262
+#: templates/question.html:221
 #, python-format
-msgid "close date %(question.closed_at)s"
+msgid "close date %(closed_at)s"
 msgstr ""
 
-#: templates/question.html:269 templates/user_stats.html:13
-msgid "Answers"
-msgstr " Answers"
+#: templates/question.html:229
+#, python-format
+msgid ""
+"\n"
+"                    One Answer:\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    %(counter)s Answers:\n"
+"                    "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/question.html:271
+#: templates/question.html:237
 msgid "oldest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:271
+#: templates/question.html:237
 msgid "oldest answers"
 msgstr "oldest"
 
-#: templates/question.html:272
+#: templates/question.html:239
 msgid "newest answers will be shown first"
 msgstr ""
 
-#: templates/question.html:272
+#: templates/question.html:239
 msgid "newest answers"
 msgstr "newest"
 
-#: templates/question.html:273
+#: templates/question.html:241
 msgid "most voted answers will be shown first"
 msgstr ""
 
-#: templates/question.html:273
+#: templates/question.html:241
 msgid "popular answers"
 msgstr "most voted"
 
-#: templates/question.html:287 templates/question.html.py:288
+#: templates/question.html:255 templates/question.html.py:256
 msgid "i like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:294 templates/question.html.py:295
+#: templates/question.html:262 templates/question.html.py:263
 msgid "i dont like this answer (click again to cancel)"
 msgstr ""
 
-#: templates/question.html:300 templates/question.html.py:301
+#: templates/question.html:268 templates/question.html.py:269
 msgid "mark this answer as favorite (click again to undo)"
 msgstr ""
 
-#: templates/question.html:306 templates/question.html.py:307
+#: templates/question.html:274 templates/question.html.py:275
 msgid "the author of the question has selected this answer as correct"
 msgstr ""
 
-#: templates/question.html:329
+#: templates/question.html:288
+msgid "answer permanent link"
+msgstr ""
+
+#: templates/question.html:289
+msgid "permanent link"
+msgstr "link"
+
+#: templates/question.html:301
 msgid "undelete"
 msgstr ""
 
-#: templates/question.html:339
-msgid "answer permanent link"
+#: templates/question.html:346
+#, python-format
+msgid ""
+"\n"
+"                                                        see <strong>one</"
+"strong> more \n"
+"                                                        "
+msgid_plural ""
+"\n"
+"                                                        see <strong>%"
+"(counter)s</strong> more\n"
+"                                                        "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/question.html:352
+#, python-format
+msgid ""
+"\n"
+"                                                        see <strong>one</"
+"strong> more comment\n"
+"                                                        "
+msgid_plural ""
+"\n"
+"                                                        see <strong>%"
+"(counter)s</strong> more comments\n"
+"                                                        "
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/question.html:378 templates/question.html.py:381
+msgid "Notify me once a day when there are any new answers"
 msgstr ""
+"<strong>Notify me</strong> once a day by email when there are any new "
+"answers or updates"
 
-#: templates/question.html:340
-msgid "permanent link"
+#: templates/question.html:384
+msgid "Notify me weekly when there are any new answers"
+msgstr ""
+"<strong>Notify me</strong> weekly when there are any new answers or updates"
+
+#: templates/question.html:389
+#, python-format
+msgid ""
+"\n"
+"                You can always adjust frequency of email updates from your %"
+"(profile_url)s\n"
+"                "
+msgstr ""
+"\n"
+"(note: you can always <a href='%(profile_url)s?"
+"sort=email_subscriptions'>adjust frequency</a> of email updates)"
+
+#: templates/question.html:396
+msgid "once you sign in you will be able to subscribe for any updates here"
 msgstr ""
+"<span class='strong'>Here</span> (once you log in) you will be able to sign "
+"up for the periodic email updates about this question."
 
-#: templates/question.html:453
+#: templates/question.html:407
 msgid "Your answer"
 msgstr ""
 
-#: templates/question.html:456
+#: templates/question.html:409
+msgid "Be the first one to answer this question!"
+msgstr ""
+
+#: templates/question.html:415
 msgid "you can answer anonymously and then login"
 msgstr ""
-"<span class='strong big'>You are now not logged in</span> but you can answer "
-"first and then login"
+"<span class='strong big'>Please start posting your answer anonymously</span> "
+"- your answer will be saved within the current session and published after "
+"you log in or create a new account. Please try to give a <strong>substantial "
+"answer</strong>, for discussions, <strong>please use comments</strong> and "
+"<strong>please do remember to vote</strong> (after you log in)!"
 
-#: templates/question.html:479
-msgid "Answer the question"
+#: templates/question.html:419
+msgid "answer your own question only to give an answer"
 msgstr ""
+"<span class='big strong'>You are welcome to answer your own question</span>, "
+"but please make sure to give an <strong>answer</strong>. Remember that you "
+"can always <strong>revise your original question</strong>. Please "
+"<strong>use comments for discussions</strong>  and <strong>please don't "
+"forget to vote :)</strong> for the answers that you liked (or perhaps did "
+"not like)! "
 
-#: templates/question.html:481
-msgid "Notify me daily if there are any new answers."
+#: templates/question.html:421
+msgid "please only give an answer, no discussions"
 msgstr ""
+"<span class='big strong'>Please try to give a substantial answer</span>. If "
+"you wanted to comment on the question or answer, just <strong>use the "
+"commenting tool</strong>. Please remember that you can always <strong>revise "
+"your answers</strong> - no need to answer the same question twice. Also, "
+"please <strong>don't forget to vote</strong> - it really helps to select the "
+"best questions and answers!"
 
-#: templates/question.html:483
-msgid "once you sign in you will be able to subscribe for any updates here"
-msgstr "Here logged in users can sign up for the question updates."
+#: templates/question.html:457
+msgid "Login/Signup to Post Your Answer"
+msgstr ""
+
+#: templates/question.html:460
+msgid "Answer Your Own Question"
+msgstr ""
+
+#: templates/question.html:462
+msgid "Answer the question"
+msgstr "Post Your Answer"
 
-#: templates/question.html:494
+#: templates/question.html:475
 msgid "Question tags"
 msgstr "Tags"
 
-#: templates/question.html:504
+#: templates/question.html:485
 msgid "question asked"
 msgstr "Asked"
 
-#: templates/question.html:504 templates/question.html.py:510
-#: templates/user_info.html:51
-msgid "ago"
-msgstr ""
-
-#: templates/question.html:507
+#: templates/question.html:488
 msgid "question was seen"
 msgstr "Seen"
 
-#: templates/question.html:507
+#: templates/question.html:488
 msgid "times"
 msgstr ""
 
-#: templates/question.html:510
+#: templates/question.html:491
 msgid "last updated"
 msgstr "Last updated"
 
-#: templates/question.html:515
+#: templates/question.html:496
 msgid "Related questions"
 msgstr ""
 
-#: templates/question_edit.html:4 templates/question_edit.html.py:65
+#: templates/question_edit.html:5 templates/question_edit.html.py:66
 msgid "Edit question"
 msgstr ""
 
@@ -1791,57 +2261,57 @@ msgstr "Tips"
 
 #: templates/question_edit_tips.html:7
 msgid "please ask a relevant question"
-msgstr ""
+msgstr "ask a question relevant to the CNPROG community"
 
 #: templates/question_edit_tips.html:10
 msgid "please try provide enough details"
 msgstr "provide enough details"
 
-#: templates/question_retag.html:3 templates/question_retag.html.py:52
+#: templates/question_retag.html:4 templates/question_retag.html.py:53
 msgid "Change tags"
 msgstr ""
 
-#: templates/question_retag.html:39
+#: templates/question_retag.html:40
 msgid "up to 5 tags, less than 20 characters each"
 msgstr ""
 
-#: templates/question_retag.html:82
+#: templates/question_retag.html:83
 msgid "Why use and modify tags?"
 msgstr ""
 
-#: templates/question_retag.html:85
+#: templates/question_retag.html:86
 msgid "tags help us keep Questions organized"
 msgstr ""
 
-#: templates/question_retag.html:91
+#: templates/question_retag.html:94
 msgid "tag editors receive special awards from the community"
 msgstr ""
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "Found by tags"
 msgstr "Tagged questions"
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "Found by title"
 msgstr ""
 
-#: templates/questions.html:23
+#: templates/questions.html:24
 msgid "All questions"
 msgstr ""
 
-#: templates/questions.html:25 templates/unanswered.html:20
+#: templates/questions.html:26 templates/unanswered.html:21
 msgid "most recently asked questions"
 msgstr ""
 
-#: templates/questions.html:26
+#: templates/questions.html:27
 msgid "most recently updated questions"
 msgstr ""
 
-#: templates/questions.html:26
+#: templates/questions.html:27
 msgid "active"
 msgstr ""
 
-#: templates/questions.html:109
+#: templates/questions.html:126
 #, python-format
 msgid ""
 "\n"
@@ -1860,7 +2330,7 @@ msgstr[1] ""
 "<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
 "class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
 
-#: templates/questions.html:116
+#: templates/questions.html:133
 #, python-format
 msgid ""
 "\n"
@@ -1881,7 +2351,7 @@ msgstr[1] ""
 "containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
 "p>"
 
-#: templates/questions.html:122
+#: templates/questions.html:139
 #, python-format
 msgid ""
 "\n"
@@ -1898,35 +2368,35 @@ msgstr[1] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
 
-#: templates/questions.html:131
+#: templates/questions.html:148
 msgid "latest questions info"
 msgstr "<strong>Newest</strong> questions are shown first."
 
-#: templates/questions.html:135
+#: templates/questions.html:152
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 
-#: templates/questions.html:136
+#: templates/questions.html:153
 msgid "Most recently answered ones are shown first."
 msgstr "<strong>Most recently answered</strong> questions are shown first."
 
-#: templates/questions.html:140
+#: templates/questions.html:157
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Questions sorted by the <strong>number of answers</strong>."
 
-#: templates/questions.html:141
+#: templates/questions.html:158
 msgid "Most answered questions are shown first."
 msgstr " "
 
-#: templates/questions.html:145
+#: templates/questions.html:162
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr ""
 
-#: templates/questions.html:146
+#: templates/questions.html:163
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:153 templates/unanswered.html:102
+#: templates/questions.html:168 templates/unanswered.html:118
 msgid "Related tags"
 msgstr "Tags"
 
@@ -1963,6 +2433,10 @@ msgstr ""
 msgid "Revision history"
 msgstr ""
 
+#: templates/revisions_answer.html:48 templates/revisions_question.html:48
+msgid "click to hide/show revision"
+msgstr ""
+
 #: templates/tags.html:6 templates/tags.html.py:30
 msgid "Tag list"
 msgstr ""
@@ -1995,16 +2469,16 @@ msgstr ""
 msgid "Nothing found"
 msgstr ""
 
-#: templates/unanswered.html:7 templates/unanswered.html.py:18
+#: templates/unanswered.html:8 templates/unanswered.html.py:19
 msgid "Unanswered questions"
 msgstr ""
 
-#: templates/unanswered.html:97
+#: templates/unanswered.html:114
 #, python-format
 msgid "have %(num_q)s unanswered questions"
 msgstr ""
-"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> "
-"questions"
+"<div class=\"questions-count\">%(num_q)s</div>questions <strong>without "
+"accepted answers</strong>"
 
 #: templates/user_edit.html:6
 msgid "Edit user profile"
@@ -2019,139 +2493,202 @@ msgid "image associated with your email address"
 msgstr ""
 
 #: templates/user_edit.html:31
-msgid "avatar"
-msgstr "<a href='/faq#gravatar'>gravatar</a>"
+#, python-format
+msgid "avatar, see %(gravatar_faq_url)s"
+msgstr "<a href='%(gravatar_faq_url)s'>gravatar</a>"
 
-#: templates/user_edit.html:36 templates/user_info.html:31
+#: templates/user_edit.html:36 templates/user_info.html:56
 msgid "Registered user"
 msgstr ""
 
-#: templates/user_edit.html:82
+#: templates/user_edit.html:82 templates/user_email_subscriptions.html:17
 msgid "Update"
 msgstr ""
 
-#: templates/user_info.html:34
+#: templates/user_email_subscriptions.html:8
+msgid "Email subscription settings"
+msgstr ""
+
+#: templates/user_email_subscriptions.html:9
+msgid "email subscription settings info"
+msgstr ""
+"<span class='big strong'>Adjust frequency of email updates.</span> Receive "
+"updates on interesting questions by email, <strong><br/>help the community</"
+"strong> by answering questions of your colleagues. If you do not wish to "
+"receive emails - select 'no email' on all items below.<br/>Updates are only "
+"sent when there is any new activity on selected items."
+
+#: templates/user_email_subscriptions.html:18
+msgid "Stop sending email"
+msgstr "Stop Email"
+
+#: templates/user_info.html:32
+msgid "Moderate this user"
+msgstr ""
+
+#: templates/user_info.html:45
 msgid "update profile"
 msgstr ""
 
-#: templates/user_info.html:40
+#: templates/user_info.html:60
 msgid "real name"
 msgstr ""
 
-#: templates/user_info.html:45
+#: templates/user_info.html:65
 msgid "member for"
-msgstr ""
+msgstr "member since"
 
-#: templates/user_info.html:50
+#: templates/user_info.html:70
 msgid "last seen"
 msgstr ""
 
-#: templates/user_info.html:56
+#: templates/user_info.html:76
 msgid "user website"
 msgstr ""
 
-#: templates/user_info.html:62
+#: templates/user_info.html:82
 msgid "location"
 msgstr ""
 
-#: templates/user_info.html:69
+#: templates/user_info.html:89
 msgid "age"
 msgstr ""
 
-#: templates/user_info.html:70
+#: templates/user_info.html:90
 msgid "age unit"
 msgstr "years old"
 
-#: templates/user_info.html:76
+#: templates/user_info.html:96
 msgid "todays unused votes"
 msgstr ""
 
-#: templates/user_info.html:77
+#: templates/user_info.html:97
 msgid "votes left"
 msgstr ""
 
-#: templates/user_preferences.html:10
-msgid "Connect with Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:13
-msgid "Twitter account name:"
-msgstr ""
-
-#: templates/user_preferences.html:15
-msgid "Twitter password:"
-msgstr ""
-
-#: templates/user_preferences.html:17
-msgid "Send my Questions to Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:18
-msgid "Send my Answers to Twitter"
-msgstr ""
-
-#: templates/user_preferences.html:19
-msgid "Save"
-msgstr ""
+#: templates/user_stats.html:12
+#, python-format
+msgid ""
+"\n"
+"                <span class=\"count\">1</span> Question\n"
+"                "
+msgid_plural ""
+"\n"
+"                <span class=\"count\">%(counter)s</span> Questions\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:10
-msgid "User questions"
-msgstr ""
+#: templates/user_stats.html:23
+#, python-format
+msgid ""
+"\n"
+"                <span class=\"count\">1</span> Answer\n"
+"                "
+msgid_plural ""
+"\n"
+"                <span class=\"count\">%(counter)s</span> Answers\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:36
 #, python-format
 msgid "the answer has been voted for %(vote_count)s times"
 msgstr ""
 
-#: templates/user_stats.html:20
+#: templates/user_stats.html:36
 msgid "this answer has been selected as correct"
 msgstr ""
 
-#: templates/user_stats.html:28
+#: templates/user_stats.html:46
 #, python-format
-msgid "the answer has been commented %(comment_count)s times"
-msgstr ""
+msgid ""
+"\n"
+"                    (one comment)\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    the answer has been commented %(comment_count)s times\n"
+"                    "
+msgstr[0] ""
+"\n"
+"(one comment)"
+msgstr[1] ""
+"\n"
+"(%(comment_count)s comments)"
 
-#: templates/user_stats.html:36
-msgid "Votes"
-msgstr ""
+#: templates/user_stats.html:61
+#, python-format
+msgid ""
+"\n"
+"                    <span class=\"count\">1</span> Vote\n"
+"                "
+msgid_plural ""
+"\n"
+"                    <span class=\"count\">%(cnt)s</span> Votes\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:41
+#: templates/user_stats.html:72
 msgid "thumb up"
 msgstr ""
 
-#: templates/user_stats.html:42
+#: templates/user_stats.html:73
 msgid "user has voted up this many times"
 msgstr ""
 
-#: templates/user_stats.html:46
+#: templates/user_stats.html:77
 msgid "thumb down"
 msgstr ""
 
-#: templates/user_stats.html:47
+#: templates/user_stats.html:78
 msgid "user voted down this many times"
 msgstr ""
 
-#: templates/user_stats.html:54
-msgid "Tags"
-msgstr ""
+#: templates/user_stats.html:87
+#, python-format
+msgid ""
+"\n"
+"                    <span class=\"count\">1</span> Tag\n"
+"                "
+msgid_plural ""
+"\n"
+"                    <span class=\"count\">%(counter)s</span> Tags\n"
+"                "
+msgstr[0] ""
+msgstr[1] ""
 
-#: templates/user_stats.html:61
+#: templates/user_stats.html:100
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr ""
 
+#: templates/user_stats.html:114
+#, python-format
+msgid ""
+"\n"
+"            <span class=\"count\">1</span> Badge\n"
+"            "
+msgid_plural ""
+"\n"
+"            <span class=\"count\">%(counter)s</span> Badges\n"
+"            "
+msgstr[0] ""
+msgstr[1] ""
+
 #: templates/user_tabs.html:7
 msgid "User profile"
 msgstr ""
 
 #: templates/user_tabs.html:16
 msgid "graph of user reputation"
-msgstr ""
+msgstr "Graph of user karma"
 
 #: templates/user_tabs.html:17
 msgid "reputation history"
-msgstr ""
+msgstr "karma history"
 
 #: templates/user_tabs.html:23
 msgid "questions that user selected as his/her favorite"
@@ -2161,10 +2698,6 @@ msgstr ""
 msgid "favorites"
 msgstr ""
 
-#: templates/user_tabs.html:28
-msgid "settings"
-msgstr ""
-
 #: templates/users.html:6 templates/users.html.py:24
 msgid "Users"
 msgstr ""
@@ -2202,16 +2735,21 @@ msgstr ""
 msgid "thumb-up off"
 msgstr ""
 
-#: templates/users_questions.html:35
+#: templates/users_questions.html:34
 msgid "this answer has been accepted to be correct"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:7
-#: templates/authopenid/changeemail.html:33
+#: templates/authopenid/changeemail.html:3
+#: templates/authopenid/changeemail.html:9
+#: templates/authopenid/changeemail.html:38
 msgid "Change email"
 msgstr "Change Email"
 
-#: templates/authopenid/changeemail.html:10
+#: templates/authopenid/changeemail.html:11
+msgid "Save your email address"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:16
 #, python-format
 msgid "change %(email)s info"
 msgstr ""
@@ -2219,57 +2757,66 @@ msgstr ""
 "you'd like to use another email for <strong>update subscriptions</strong>."
 "<br>Currently you are using <strong>%(email)s</strong>"
 
-#: templates/authopenid/changeemail.html:13
-#: templates/authopenid/changeopenid.html:14
-#: templates/authopenid/changepw.html:19 templates/authopenid/delete.html:15
-#: templates/authopenid/delete.html:25
-msgid "Please correct errors below:"
+#: templates/authopenid/changeemail.html:18
+#, python-format
+msgid "here is why email is required, see %(gravatar_faq_url)s"
 msgstr ""
+"<span class='strong big'>Please enter your email address in the box below.</"
+"span> Valid email address is required on this Q&amp;"
+"A forum. If you like, you can <strong>receive updates</strong> on "
+"interesting questions or entire forum via email. Also, your email is used to "
+"create a unique <a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a> "
+"image for your account. Email addresses are never shown or otherwise shared "
+"with anybody else."
 
-#: templates/authopenid/changeemail.html:30
+#: templates/authopenid/changeemail.html:31
 msgid "Your new Email"
 msgstr ""
 "<strong>Your new Email:</strong> (will <strong>not</strong> be shown to "
 "anyone, must be valid)"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:154
-msgid "Password"
+msgid "Your Email"
 msgstr ""
+"<strong>Your Email</strong> (<i>must be valid, never shown to others</i>)"
 
-#: templates/authopenid/changeemail.html:42
+#: templates/authopenid/changeemail.html:38
+msgid "Save Email"
+msgstr ""
+
+#: templates/authopenid/changeemail.html:49
 msgid "Validate email"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:45
+#: templates/authopenid/changeemail.html:52
 #, python-format
-msgid "validate %(email)s info"
+msgid "validate %(email)s info or go to %(change_email_url)s"
 msgstr ""
 "<span class=\"strong big\">An email with a validation link has been sent to %"
 "(email)s.</span> Please <strong>follow the emailed link</strong> with your "
 "web browser. Email validation is necessary to help insure the proper use of "
-"email on <span class=\"orange\">Q&amp;A</span> forum. If you would like "
-"to use <strong>another email</strong>, please <a href=\"/email/change/"
-"\"><strong>change it again</strong></a>."
+"email on <span class=\"orange\">Q&amp;A</span>. If you would like "
+"to use <strong>another email</strong>, please <a href='%(change_email_url)"
+"s'><strong>change it again</strong></a>."
 
-#: templates/authopenid/changeemail.html:50
+#: templates/authopenid/changeemail.html:57
 msgid "Email not changed"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:53
+#: templates/authopenid/changeemail.html:60
 #, python-format
-msgid "old %(email)s kept"
+msgid "old %(email)s kept, if you like go to %(change_email_url)s"
 msgstr ""
 "<span class=\"strong big\">Your email address %(email)s has not been changed."
 "</span> If you decide to change it later - you can always do it by editing "
-"it in your user profile or by using the <a href=\"/email/change/"
-"\"><strong>previous form</strong></a> again."
+"it in your user profile or by using the <a href='%(change_email_url)"
+"s'><strong>previous form</strong></a> again."
 
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:65
 msgid "Email changed"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:68
 #, python-format
 msgid "your current %(email)s can be used for this"
 msgstr ""
@@ -2278,11 +2825,11 @@ msgstr ""
 "Email notifications are sent once a day or less frequently - only when there "
 "are any news."
 
-#: templates/authopenid/changeemail.html:66
+#: templates/authopenid/changeemail.html:73
 msgid "Email verified"
 msgstr ""
 
-#: templates/authopenid/changeemail.html:69
+#: templates/authopenid/changeemail.html:76
 msgid "thanks for verifying email"
 msgstr ""
 "<span class=\"big strong\">Thank you for verifying your email!</span> Now "
@@ -2291,11 +2838,11 @@ msgstr ""
 "updates</strong> - then will be notified about changes <strong>once a day</"
 "strong> or less frequently."
 
-#: templates/authopenid/changeemail.html:74
+#: templates/authopenid/changeemail.html:81
 msgid "email key not sent"
 msgstr "Validation email not sent"
 
-#: templates/authopenid/changeemail.html:77
+#: templates/authopenid/changeemail.html:84
 #, python-format
 msgid "email key not sent %(email)s change email here %(change_link)s"
 msgstr ""
@@ -2303,6 +2850,12 @@ msgstr ""
 "validated before</span> so the new key was not sent. You can <a href='%"
 "(change_link)s'>change</a> email used for update subscriptions if necessary."
 
+#: templates/authopenid/changeopenid.html:4
+#: templates/authopenid/changeopenid.html:30
+#: templates/authopenid/settings.html:34
+msgid "Change OpenID"
+msgstr ""
+
 #: templates/authopenid/changeopenid.html:8
 msgid "Account: change OpenID URL"
 msgstr ""
@@ -2312,97 +2865,129 @@ msgid ""
 "This is where you can change your OpenID URL. Make sure you remember it!"
 msgstr ""
 
+#: templates/authopenid/changeopenid.html:14
+#: templates/authopenid/delete.html:14 templates/authopenid/delete.html:24
+msgid "Please correct errors below:"
+msgstr ""
+
 #: templates/authopenid/changeopenid.html:29
 msgid "OpenID URL:"
 msgstr ""
 
-#: templates/authopenid/changeopenid.html:30
-msgid "Change OpenID"
+#: templates/authopenid/changepw.html:5 templates/authopenid/changepw.html:14
+#: templates/authopenid/settings.html:29
+msgid "Change password"
 msgstr ""
 
-#: templates/authopenid/changepw.html:14
+#: templates/authopenid/changepw.html:7
 msgid "Account: change password"
-msgstr ""
+msgstr "Change your password"
 
-#: templates/authopenid/changepw.html:17
+#: templates/authopenid/changepw.html:8
 msgid "This is where you can change your password. Make sure you remember it!"
 msgstr ""
+"<span class='strong'>To change your password</span> please fill out and "
+"submit this form"
 
-#: templates/authopenid/changepw.html:27
-msgid "Current password"
-msgstr ""
-
-#: templates/authopenid/changepw.html:28
-msgid "New password"
-msgstr ""
-
-#: templates/authopenid/changepw.html:29
-msgid "New password again"
-msgstr ""
-
-#: templates/authopenid/changepw.html:30 templates/authopenid/settings.html:29
-msgid "Change password"
-msgstr ""
-
-#: templates/authopenid/complete.html:5
+#: templates/authopenid/complete.html:19
 msgid "Connect your OpenID with this site"
 msgstr "New user signup"
 
-#: templates/authopenid/complete.html:8
+#: templates/authopenid/complete.html:22
 msgid "Connect your OpenID with your account on this site"
 msgstr "New user signup"
 
-#: templates/authopenid/complete.html:12
+#: templates/authopenid/complete.html:27
 #, python-format
-msgid "register new %(provider)s account info"
+msgid "register new %(provider)s account info, see %(gravatar_faq_url)s"
 msgstr ""
 "<p><span class=\"big strong\">You are here for the first time with your %"
 "(provider)s login.</span> Please create your <strong>screen name</strong> "
 "and save your <strong>email</strong> address. Saved email address will let "
 "you <strong>subscribe for the updates</strong> on the most interesting "
 "questions and will be used to create and retrieve your unique avatar image - "
-"<a href='/faq#gravatar'><strong>gravatar</strong></a>."
+"<a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a>.</p>"
 
-#: templates/authopenid/complete.html:14
+#: templates/authopenid/complete.html:31
+#, python-format
+msgid ""
+"%(username)s already exists, choose another name for \n"
+"                            %(provider)s. Email is required too, see %"
+"(gravatar_faq_url)s\n"
+"                        "
+msgstr ""
+"<p><span class='strong big'>Oops... looks like screen name %(username)s is "
+"already used in another account.</span></p><p>Please choose another screen name "
+"to use with your %(provider)s login. Also, a valid email address is "
+"required on the <span class='orange'>Q&amp;A</span> forum. Your "
+"email is used to create a unique <a href='%(gravatar_faq_url)"
+"s'><strong>gravatar</strong></a> image for your account. If you like, "
+"you can <strong>receive updates</strong> on the interesting questions or "
+"entire forum by email. Email addresses are never shown or otherwise shared "
+"with anybody else.</p>"
+
+#: templates/authopenid/complete.html:35
+#, python-format
+msgid ""
+"register new external %(provider)s account info, see %(gravatar_faq_url)s"
+msgstr ""
+"<p><span class=\"big strong\">You are here for the first time with your %"
+"(provider)s login.</span></p><p>You can either keep your <strong>screen "
+"name</strong> the same as your %(provider)s login name  or choose some other "
+"nickname.</p><p>Also, please save a valid <strong>email</strong> address. "
+"With the email you can <strong>subscribe for the updates</strong> on the "
+"most interesting questions. Email address is also used to create and "
+"retrieve your unique avatar image - <a href='%(gravatar_faq_url)"
+"s'><strong>gravatar</strong></a>.</p>"
+
+#: templates/authopenid/complete.html:40
 msgid "This account already exists, please use another."
 msgstr ""
 
-#: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32
-#: templates/authopenid/signin.html:138
+#: templates/authopenid/complete.html:55
 msgid "Sorry, looks like we have some errors:"
 msgstr ""
 
-#: templates/authopenid/complete.html:47
+#: templates/authopenid/complete.html:76
 msgid "Screen name label"
 msgstr "<strong>Screen Name</strong> (<i>will be shown to others</i>)"
 
-#: templates/authopenid/complete.html:48
+#: templates/authopenid/complete.html:83
 msgid "Email address label"
 msgstr ""
 "<strong>Email Address</strong> (<i>will <strong>not</strong> be shared with "
 "anyone, must be valid</i>)"
 
-#: templates/authopenid/complete.html:49
+#: templates/authopenid/complete.html:89 templates/authopenid/signup.html:15
+msgid "receive updates motivational blurb"
+msgstr ""
+"<strong>Receive forum updates by email</strong> - this will help our "
+"community grow and become more useful.<br/>By default "
+"<span class='orange'>Q&amp;A</span> forum sends up to <strong>one "
+"email digest per week</strong>  - only when there is anything new.<br/>If "
+"you like, please adjust this now or any time later from your user account."
+
+#: templates/authopenid/complete.html:91
 msgid "create account"
 msgstr "Signup"
 
-#: templates/authopenid/complete.html:56
+#: templates/authopenid/complete.html:100
 msgid "Existing account"
 msgstr ""
 
-#: templates/authopenid/complete.html:57
+#: templates/authopenid/complete.html:101
 msgid "user name"
 msgstr ""
 
-#: templates/authopenid/complete.html:58 templates/authopenid/signin.html:128
+#: templates/authopenid/complete.html:102
 msgid "password"
 msgstr ""
 
-#: templates/authopenid/complete.html:61
+#: templates/authopenid/complete.html:107
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:156
+#: templates/authopenid/complete.html:108 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr ""
 
@@ -2415,12 +3000,11 @@ msgid "Your account details are:"
 msgstr ""
 
 #: templates/authopenid/confirm_email.txt:6
-#: templates/authopenid/sendpw_email.txt:7
 msgid "Username:"
 msgstr ""
 
 #: templates/authopenid/confirm_email.txt:7
-#: templates/authopenid/delete.html:20
+#: templates/authopenid/delete.html:19
 msgid "Password:"
 msgstr ""
 
@@ -2430,45 +3014,51 @@ msgstr ""
 
 #: templates/authopenid/confirm_email.txt:12
 #: templates/authopenid/email_validation.txt:14
-#: templates/authopenid/sendpw_email.txt:13
+#: templates/authopenid/sendpw_email.txt:8
 msgid ""
 "Sincerely,\n"
 "Forum Administrator"
 msgstr ""
+"Sincerely,\n"
+"Q&A Forum Administrator"
+
+#: templates/authopenid/delete.html:4 templates/authopenid/settings.html:38
+msgid "Delete account"
+msgstr ""
 
-#: templates/authopenid/delete.html:9
+#: templates/authopenid/delete.html:8
 msgid "Account: delete account"
 msgstr ""
 
-#: templates/authopenid/delete.html:13
+#: templates/authopenid/delete.html:12
 msgid ""
 "Note: After deleting your account, anyone will be able to register this "
 "username."
 msgstr ""
 
-#: templates/authopenid/delete.html:17
+#: templates/authopenid/delete.html:16
 msgid "Check confirm box, if you want delete your account."
 msgstr ""
 
-#: templates/authopenid/delete.html:32
+#: templates/authopenid/delete.html:31
 msgid "I am sure I want to delete my account."
 msgstr ""
 
-#: templates/authopenid/delete.html:33
+#: templates/authopenid/delete.html:32
 msgid "Password/OpenID URL"
 msgstr ""
 
-#: templates/authopenid/delete.html:33
+#: templates/authopenid/delete.html:32
 msgid "(required for your security)"
 msgstr ""
 
-#: templates/authopenid/delete.html:35
+#: templates/authopenid/delete.html:34
 msgid "Delete account permanently"
 msgstr ""
 
 #: templates/authopenid/email_validation.txt:2
 msgid "Greetings from the Q&A forum"
-msgstr "Greetings from the Q&amp;A forum"
+msgstr ""
 
 #: templates/authopenid/email_validation.txt:4
 msgid "To make use of the Forum, please follow the link below:"
@@ -2485,38 +3075,33 @@ msgid ""
 "for any inconvenience"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
-msgid "Send new password"
-msgstr ""
-
-#: templates/authopenid/sendpw.html:12
-msgid "Lost your password? No problem - here you can reset it."
+#: templates/authopenid/external_legacy_login_info.html:4
+#: templates/authopenid/external_legacy_login_info.html:7
+msgid "Traditional login information"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:13
-msgid ""
-"Please enter your username below and new password will be sent to your "
-"registered e-mail"
-msgstr ""
+#: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:7
+msgid "Send new password"
+msgstr "Recover password"
 
-#: templates/authopenid/sendpw.html:28
-msgid "User name"
+#: templates/authopenid/sendpw.html:10
+msgid "password recovery information"
 msgstr ""
+"<span class='big strong'>Forgot you password? No problems - just get a new "
+"one!</span><br/>Please follow the following steps:<br/>&bull; submit your "
+"user name below and check your email<br/>&bull; <strong>follow the "
+"activation link</strong> for the new password - sent to you by email and "
+"login with the suggested password<br/>&bull; at this you might want to "
+"change your password to something you can remember better"
 
-#: templates/authopenid/sendpw.html:30
+#: templates/authopenid/sendpw.html:21
 msgid "Reset password"
-msgstr ""
+msgstr "Send me a new password"
 
-#: templates/authopenid/sendpw.html:30
+#: templates/authopenid/sendpw.html:22
 msgid "return to login"
 msgstr ""
 
-#: templates/authopenid/sendpw.html:33
-msgid ""
-"Note: your new password will be activated only after you click the "
-"activation link in the email message"
-msgstr ""
-
 #: templates/authopenid/sendpw_email.txt:2
 #, python-format
 msgid ""
@@ -2525,15 +3110,18 @@ msgid ""
 msgstr ""
 
 #: templates/authopenid/sendpw_email.txt:5
-msgid "Your new account details are:"
-msgstr ""
-
-#: templates/authopenid/sendpw_email.txt:8
-msgid "New password:"
+#, python-format
+msgid ""
+"email explanation how to use new %(password)s for %(username)s\n"
+"with the %(key_link)s"
 msgstr ""
+"To change your password, please follow these steps:\n"
+"* visit this link: %(key_link)s\n"
+"* login with user name %(username)s and password %(password)s\n"
+"* go to your user profile and set the password to something you can remember"
 
-#: templates/authopenid/sendpw_email.txt:10
-msgid "To confirm that you wanted to reset your password please visit:"
+#: templates/authopenid/settings.html:4
+msgid "Account functions"
 msgstr ""
 
 #: templates/authopenid/settings.html:30
@@ -2552,15 +3140,11 @@ msgstr ""
 msgid "Change openid associated to your account"
 msgstr ""
 
-#: templates/authopenid/settings.html:38
-msgid "Delete account"
-msgstr ""
-
 #: templates/authopenid/settings.html:39
 msgid "Erase your username and all your data from website"
 msgstr ""
 
-#: templates/authopenid/signin.html:4 templates/authopenid/signin.html:21
+#: templates/authopenid/signin.html:5 templates/authopenid/signin.html:21
 msgid "User login"
 msgstr "User login"
 
@@ -2588,148 +3172,105 @@ msgstr ""
 "strong> %(summary)s...\"</i> <span class=\"strong big\">is saved and will be "
 "posted once you log in.</span>"
 
-#: templates/authopenid/signin.html:40
+#: templates/authopenid/signin.html:42
 msgid "Click to sign in through any of these services."
 msgstr ""
-"<p><span class=\"big strong\">Please select your favorite login method below.</span>"
-"</p><p><font color=\"gray\">External login services use <a "
-"href=\"http://openid.net\"><b>OpenID</b></a> technology that increases "
-"security of your online identity and makes login process simpler. First option "
-"requires login name and password.</font></p>"
+"<p><span class=\"big strong\">Please select your favorite login method below."
+"</span></p><p><font color=\"gray\">External login services use <a href="
+"\"http://openid.net\"><b>OpenID</b></a> technology, where your password "
+"always stays confidential between you and your login provider and you don't "
+"have to remember another one. CNPROG option requires your login name and "
+"password entered here.</font></p>"
 
-#: templates/authopenid/signin.html:113
+#: templates/authopenid/signin.html:117
 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>"
 msgstr ""
-"<span class=\"big strong\">Enter your <span id=\"enter_your_what\">Provider "
-"user name</span></span><br><span class='grey'>(or select another login method above)</span>"
+"<span class=\"big strong\">Enter your </span><span id=\"enter_your_what\" "
+"class='big strong'>Provider user name</span><br/><span class='grey'>(or "
+"select another login method above)</span>"
 
-#: templates/authopenid/signin.html:120
+#: templates/authopenid/signin.html:124
 msgid ""
 "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> "
 "web address"
 msgstr ""
 "<span class=\"big strong\">Enter your <a class=\"openid_logo\" href=\"http://"
-"openid.net\">OpenID</a> web address</span><br><span class='grey'>(or choose another login "
-"method above)</span>"
+"openid.net\">OpenID</a> web address</span><br/><span class='grey'>(or choose "
+"another login method above)</span>"
 
-#: templates/authopenid/signin.html:122 templates/authopenid/signin.html:130
-#: templates/authopenid/signin.html:155
+#: templates/authopenid/signin.html:126 templates/authopenid/signin.html:138
 msgid "Login"
 msgstr ""
 
-#: templates/authopenid/signin.html:125
+#: templates/authopenid/signin.html:129
 msgid "Enter your login name and password"
 msgstr ""
-"<span class='big strong'>Enter your forum login and password</span><br/>"
-"<span class='grey'>(or select your OpenID provider above)</span>"
-
-#: templates/authopenid/signin.html:126
-msgid "login name"
-msgstr ""
-
-#: templates/authopenid/signin.html:134
-msgid "we support two login modes"
-msgstr ""
-"You can log in either through one of these services or traditionally - using "
-"local username/password."
+"<span class='big strong'>Enter your CNPROG login and password</span><br/"
+"><span class='grey'>(or select your OpenID provider above)</span>"
 
-#: templates/authopenid/signin.html:152
-msgid "Use login name and password"
+#: templates/authopenid/signin.html:133
+msgid "Login name"
 msgstr ""
 
-#: templates/authopenid/signin.html:153
-msgid "Login name"
+#: templates/authopenid/signin.html:135
+msgid "Password"
 msgstr ""
 
-#: templates/authopenid/signin.html:157
-msgid "Create new account"
+#: templates/authopenid/signin.html:139
+msgid "Create account"
 msgstr ""
 
-#: templates/authopenid/signin.html:166
+#: templates/authopenid/signin.html:149
 msgid "Why use OpenID?"
 msgstr ""
 
-#: templates/authopenid/signin.html:169
+#: templates/authopenid/signin.html:152
 msgid "with openid it is easier"
 msgstr "With the OpenID you don't need to create new username and password."
 
-#: templates/authopenid/signin.html:172
+#: templates/authopenid/signin.html:155
 msgid "reuse openid"
 msgstr "You can safely re-use the same login for all OpenID-enabled websites."
 
-#: templates/authopenid/signin.html:175
+#: templates/authopenid/signin.html:158
 msgid "openid is widely adopted"
 msgstr ""
 "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-"
 "enabled."
 
-#: templates/authopenid/signin.html:178
+#: templates/authopenid/signin.html:161
 msgid "openid is supported open standard"
 msgstr "OpenID is based on an open standard, supported by many organizations."
 
-#: templates/authopenid/signin.html:183
+#: templates/authopenid/signin.html:166
 msgid "Find out more"
 msgstr ""
 
-#: templates/authopenid/signin.html:184
+#: templates/authopenid/signin.html:167
 msgid "Get OpenID"
 msgstr ""
 
-#: templates/authopenid/signup.html:4 templates/authopenid/signup.html.py:8
+#: templates/authopenid/signup.html:4
 msgid "Signup"
 msgstr ""
 
-#: templates/authopenid/signup.html:12
-msgid ""
-"We support two types of user registration: conventional username/password, "
-"and"
+#: templates/authopenid/signup.html:8
+msgid "Create login name and password"
 msgstr ""
 
-#: templates/authopenid/signup.html:12
-msgid "the OpenID method"
+#: templates/authopenid/signup.html:10
+msgid "Traditional signup info"
 msgstr ""
+"<span class='strong big'>If you prefer, create your forum login name and "
+"password here. However</span>, please keep in mind that we also support "
+"<strong>OpenID</strong> login method. With <strong>OpenID</strong> you can "
+"simply reuse your external login (e.g. Gmail or AOL) without ever sharing "
+"your login details with anyone and having to remember yet another password."
 
 #: templates/authopenid/signup.html:17
-msgid "Sorry, looks like we have some errors"
-msgstr ""
-
-#: templates/authopenid/signup.html:35
-msgid "Conventional registration"
-msgstr ""
-
-#: templates/authopenid/signup.html:36
-msgid "choose a user name"
-msgstr ""
-
-#: templates/authopenid/signup.html:42
-msgid "back to login"
+msgid "Create Account"
 msgstr ""
 
-#: templates/authopenid/signup.html:46
-msgid "Register with your OpenID"
+#: templates/authopenid/signup.html:19
+msgid "return to OpenID login"
 msgstr ""
-
-#: templates/authopenid/signup.html:49
-msgid "Login with your OpenID"
-msgstr ""
-
-#
-#~ msgid "editing tips"
-#~ msgstr "Tips"
-
-#~ msgid "Newest questions shown first."
-#~ msgstr ""
-#~ "Questions are sorted by <strong>entry date</strong>.Newest questions "
-#~ "shown first."
-
-#~ msgid ""
-#~ "please use space to separate tags (this enables autocomplete feature)"
-#~ msgstr "please use space to separate tags (uses autocomplete utility)"
-
-#~ msgid "select openid provider"
-#~ msgstr "1) Please select your id service provider."
-
-#~ msgid "verify openid link and login"
-#~ msgstr ""
-#~ "2) Please verify the OpenID URL (type your login name over {username}, if "
-#~ "present) and then log in."
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 91639ba1..fc7ebe14 100644
Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index d7655dd7..b528fcf2 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -2,21 +2,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-17 16:44+0000\n"
-"PO-Revision-Date: 2009-08-17 10:04-0600\n"
+"POT-Creation-Date: 2009-08-12 15:53+0000\n"
+"PO-Revision-Date: \n"
 "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: settings.py:12 urls.py:25 forum/views.py:310 forum/views.py:705
+#: 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:310 forum/views.py:706
+#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699
+#: templates/authopenid/confirm_email.txt:10
 msgid "signin/"
 msgstr "ingresar/"
 
@@ -24,132 +25,127 @@ msgstr "ingresar/"
 msgid "upfiles/"
 msgstr "archivossubidos/"
 
-#: urls.py:27 django_authopenid/urls.py:16
-msgid "signup/"
-msgstr "registrarse/"
-
-#: urls.py:28 urls.py:29 urls.py:30 django_authopenid/urls.py:26
+#: 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:28
+#: urls.py:27
 msgid "change/"
 msgstr "cambiar/"
 
-#: urls.py:29
+#: urls.py:28
 msgid "sendkey/"
 msgstr "enviarclave/"
 
-#: urls.py:30
+#: urls.py:29
 msgid "verify/"
 msgstr "verificar/"
 
-#: urls.py:31
+#: urls.py:30
 msgid "about/"
 msgstr "acercadenosotros/"
 
-#: urls.py:32
+#: urls.py:31
 msgid "faq/"
 msgstr "preguntasfrecuentes/"
 
-#: urls.py:33
+#: urls.py:32
 msgid "privacy/"
 msgstr "códigodeprivacidad/"
 
-#: urls.py:34
+#: urls.py:33
 msgid "logout/"
 msgstr "cerrarsesion/"
 
-#: urls.py:35 urls.py:36 urls.py:37 urls.py:49 forum/models.py:425
+#: urls.py:34 urls.py:35 urls.py:36 urls.py:48 forum/models.py:418
 msgid "answers/"
 msgstr "respuestas/"
 
-#: urls.py:35 urls.py:47
+#: urls.py:34 urls.py:46
 msgid "comments/"
 msgstr "comentarios/"
 
-#: urls.py:36 urls.py:41 urls.py:55 templates/user_info.html:34
+#: urls.py:35 urls.py:40 urls.py:54 templates/user_info.html:34
 msgid "edit/"
 msgstr "editar/"
 
-#: urls.py:37 urls.py:46
+#: urls.py:36 urls.py:45
 msgid "revisions/"
 msgstr "revisiones/"
 
-#: urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 urls.py:43
-#: urls.py:44 urls.py:45 urls.py:46 urls.py:47 urls.py:48 forum/feed.py:19
-#: forum/models.py:313 forum/views.py:1232 forum/views.py:1234
-#: forum/views.py:1474
+#: 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 "preguntas/"
 
-#: urls.py:39 urls.py:65
+#: urls.py:38 urls.py:64
 msgid "ask/"
 msgstr "preguntar/"
 
-#: urls.py:40
+#: urls.py:39
 msgid "unanswered/"
 msgstr "sinrespuesta/"
 
-#: urls.py:42
+#: urls.py:41
 msgid "close/"
 msgstr "cerrar/"
 
-#: urls.py:43
+#: urls.py:42
 msgid "reopen/"
 msgstr "reabrir/"
 
-#: urls.py:44
+#: urls.py:43
 msgid "answer/"
 msgstr "respuesta/"
 
-#: urls.py:45
+#: urls.py:44
 msgid "vote/"
 msgstr "votar/"
 
-#: urls.py:48 urls.py:49 django_authopenid/urls.py:29
+#: urls.py:47 urls.py:48 django_authopenid/urls.py:29
 msgid "delete/"
 msgstr "borrar/"
 
-#: urls.py:51
+#: urls.py:50
 msgid "question/"
 msgstr "pregunta/"
 
-#: urls.py:52 urls.py:53 forum/views.py:747 forum/views.py:2071
+#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013
 msgid "tags/"
 msgstr "etiquetas/"
 
-#: urls.py:54 urls.py:55 urls.py:56 forum/views.py:1034 forum/views.py:1038
-#: forum/views.py:1476 forum/views.py:1809 forum/views.py:2073
+#: 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/"
 
-#: urls.py:57 urls.py:58
+#: urls.py:56 urls.py:57
 msgid "badges/"
 msgstr "distinciones/"
 
-#: urls.py:59
+#: urls.py:58
 msgid "messages/"
 msgstr "mensajes/"
 
-#: urls.py:59
+#: urls.py:58
 msgid "markread/"
 msgstr "marcarleido/"
 
-#: urls.py:61
+#: urls.py:60
 msgid "nimda/"
 msgstr "administrador/"
 
-#: urls.py:63
+#: urls.py:62
 msgid "upload/"
 msgstr "subir/"
 
-#: urls.py:64 urls.py:65 urls.py:66
+#: urls.py:63 urls.py:64 urls.py:65
 msgid "books/"
 msgstr "libros/"
 
-#: urls.py:67
+#: urls.py:66
 msgid "search/"
 msgstr "buscar/"
 
@@ -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:310 forum/views.py:706
+#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699
 msgid "newquestion/"
 msgstr "nuevapregunta/"
 
@@ -264,19 +260,14 @@ msgstr "completado/"
 msgid "register/"
 msgstr "registrarse/"
 
-#: django_authopenid/urls.py:19
+#: django_authopenid/urls.py:16
+msgid "signup/"
+msgstr "registrarse/"
+
+#: django_authopenid/urls.py:18
 msgid "sendpw/"
 msgstr "enviarcontrasena/"
 
-#: django_authopenid/urls.py:20
-#, fuzzy
-msgid "password/"
-msgstr "contraseña"
-
-#: django_authopenid/urls.py:20
-msgid "confirm/"
-msgstr ""
-
 #: django_authopenid/urls.py:27
 msgid "validate/"
 msgstr ""
@@ -532,8 +523,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:210
-#: templates/question.html.py:396 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"
@@ -559,84 +550,75 @@ 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:98 forum/forms.py:159
-msgid "please choice a category"
-msgstr "por favor escoja una categoría"
-
-#: forum/forms.py:99 forum/forms.py:160
-msgid "Category"
-msgstr "Categoría"
-
-#: forum/forms.py:180
+#: forum/forms.py:175
 msgid "this email does not have to be linked to gravatar"
 msgstr "este email no tiene porque estar asociado a un Gravatar"
 
-#: forum/forms.py:181
+#: forum/forms.py:176
 msgid "Real name"
 msgstr "Nombre real"
 
-#: forum/forms.py:182
+#: forum/forms.py:177
 msgid "Website"
 msgstr "Sitio Web"
 
-#: forum/forms.py:183
+#: forum/forms.py:178
 msgid "Location"
 msgstr "Ubicación"
 
-#: forum/forms.py:184
+#: forum/forms.py:179
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: forum/forms.py:184
+#: forum/forms.py:179
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr "no será mostrado, usado para calcular la edad. Formato: YYY-MM-DD"
 
-#: forum/forms.py:185 templates/authopenid/settings.html:21
+#: forum/forms.py:180 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr "Perfil"
 
-#: forum/forms.py:212 forum/forms.py:213
+#: forum/forms.py:207 forum/forms.py:208
 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:253
-#, python-format
+#: forum/models.py:246
 msgid "%(author)s modified the question"
 msgstr "%(author)s modificó la pregunta"
 
-#: forum/models.py:257
+#: 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:262
+#: forum/models.py:255
 #, python-format
 msgid "%(people)s commented the question"
 msgstr "%(people)s comentarion la pregunta"
 
-#: forum/models.py:267
+#: forum/models.py:260
 #, python-format
 msgid "%(people)s commented answers"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:269
+#: forum/models.py:262
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr "%(people)s comentaron la respuesta"
 
-#: forum/models.py:313 forum/models.py:425
+#: forum/models.py:306 forum/models.py:418
 msgid "revisions"
 msgstr "revisiones/"
 
-#: forum/models.py:448 templates/badges.html:51
+#: forum/models.py:441 templates/badges.html:51
 msgid "gold"
 msgstr "oro"
 
-#: forum/models.py:449 templates/badges.html:59
+#: forum/models.py:442 templates/badges.html:59
 msgid "silver"
 msgstr "plata"
 
-#: forum/models.py:450 templates/badges.html:66
+#: forum/models.py:443 templates/badges.html:66
 msgid "bronze"
 msgstr "bronce"
 
@@ -724,27 +706,27 @@ msgstr "preferencias del usuario"
 msgid "profile - user preferences"
 msgstr "perfil - preferencia de "
 
-#: forum/views.py:988
+#: 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:1918
+#: 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:1920
+#: 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:1922
+#: 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:1924
+#: forum/views.py:1866
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
@@ -868,22 +850,22 @@ msgid "select revision"
 msgstr "seleccionar revisión"
 
 #: templates/answer_edit.html:62 templates/ask.html:94
-#: templates/question.html:468 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:468 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:71 templates/question_edit.html:121
+#: 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:72 templates/close.html:29
-#: templates/question_edit.html:122 templates/question_retag.html:74
+#: 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"
@@ -974,16 +956,15 @@ msgstr ""
 "a>. <br/> 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:107 templates/ask.html.py:114
-#: templates/question_edit.html:117
+#: templates/ask.html:107
 msgid "(required)"
 msgstr "(requerido)"
 
-#: templates/ask.html:121
+#: templates/ask.html:114
 msgid "Login/signup to post your question"
 msgstr "Iniciar sesión/registrarse para publicar su pregunta"
 
-#: templates/ask.html:123
+#: templates/ask.html:116
 msgid "Ask your question"
 msgstr "Haz tu pregunta"
 
@@ -999,7 +980,7 @@ msgstr "Usuarios han sido galardonados con distinciones:"
 msgid "Badges summary"
 msgstr "Resumen de distinciones"
 
-#: templates/badges.html:17 templates/user_stats.html:73
+#: templates/badges.html:17 templates/user_stats.html:115
 msgid "Badges"
 msgstr "Distinciones"
 
@@ -1100,17 +1081,17 @@ msgid "ask the author"
 msgstr "preguntar al autor"
 
 #: templates/book.html:88 templates/book.html.py:93
-#: templates/users_questions.html:18
+#: 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:18
+#: 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:32
+#: templates/unanswered.html:37 templates/users_questions.html:30
 msgid "votes"
 msgstr "votos"
 
@@ -1119,14 +1100,14 @@ 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:42
+#: templates/unanswered.html:38 templates/users_questions.html:40
 msgid "views"
 msgstr "vistas"
 
-#: templates/book.html:125 templates/index.html:69 templates/question.html:500
-#: templates/questions.html:84 templates/questions.html.py:157
+#: 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:54
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "using tags"
 msgstr "usando etiquetas"
 
@@ -1138,23 +1119,6 @@ msgstr "suscribirse al RSS del libro"
 msgid "subscribe to the questions feed"
 msgstr "suscribirse al agregado de noticias"
 
-#: templates/categories.html:6 templates/categories.html.py:29
-msgid "Category list"
-msgstr "Lista de Categorías"
-
-#: templates/categories.html:34 templates/tags.html:42
-msgid "Nothing found"
-msgstr "Nada encontrado"
-
-#: templates/categories.html:40
-#, fuzzy
-msgid "see questions that matches"
-msgstr "ver preguntas etiquetadas"
-
-#: templates/categories.html:40
-msgid "category "
-msgstr "categoría"
-
 #: templates/close.html:6 templates/close.html.py:16
 msgid "Close question"
 msgstr "Cerrar pregunta"
@@ -1514,14 +1478,14 @@ msgid "all questions"
 msgstr "todas las preguntas"
 
 #: templates/index.html:47 templates/questions.html:45
-#: templates/unanswered.html:36 templates/users_questions.html:37
+#: templates/unanswered.html:36 templates/users_questions.html:35
 msgid "answers"
 msgstr "respuestas"
 
-#: templates/index.html:69 templates/question.html:500
-#: templates/questions.html:84 templates/questions.html.py:157
+#: 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:54
+#: templates/unanswered.html.py:106 templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr "ver preguntas etiquetadas"
 
@@ -1668,7 +1632,7 @@ msgid "i like this post (click again to cancel)"
 msgstr "Me gusta esta entrada (clickear devuelta para cancelar)"
 
 #: templates/question.html:75 templates/question.html.py:89
-#: templates/question.html:290
+#: templates/question.html:289
 msgid "current number of votes"
 msgstr "número actual de votos"
 
@@ -1687,171 +1651,169 @@ msgstr ""
 "remover marca de favorito a esta pregunta (clickear devuelta para volver a "
 "marcar)"
 
-#: templates/question.html:128 templates/questions.html:87
-msgid "Category: "
-msgstr "Categoría: "
-
-#: templates/question.html:135 templates/question.html.py:323
+#: 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:139 templates/question.html.py:333
+#: templates/question.html:138 templates/question.html.py:332
 msgid "delete"
 msgstr "borrar"
 
-#: templates/question.html:144
+#: templates/question.html:143
 msgid "reopen"
 msgstr "re-abrir"
 
-#: templates/question.html:149
+#: templates/question.html:148
 msgid "close"
 msgstr "cerrar"
 
-#: templates/question.html:155 templates/question.html.py:346
+#: 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:156 templates/question.html.py:347
+#: templates/question.html:155 templates/question.html.py:346
 msgid "flag offensive"
 msgstr "marcar como ofensivo"
 
-#: templates/question.html:168 templates/question.html.py:356
+#: 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:217 templates/question.html.py:403
+#: 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:247 templates/question.html.py:430
+#: templates/question.html:246 templates/question.html.py:429
 msgid "comments"
 msgstr "comentarios"
 
-#: templates/question.html:248 templates/question.html.py:431
+#: templates/question.html:247 templates/question.html.py:430
 msgid "add comment"
 msgstr "agregar comentario"
 
-#: templates/question.html:261
-msgid "The question has been closed for the following reason"
-msgstr "La pregunta fue cerrada por el siguiente motivo "
-
-#: templates/question.html:261
-msgid "by"
-msgstr "por"
+#: templates/question.html:260
+#, python-format
+msgid ""
+"The question has been closed for the following reason \"%(question."
+"get_close_reason_display)s\" by"
+msgstr ""
+"La pregunta ha sido cerrada por el siguiente motivo \"%(question."
+"get_close_reason_display)s\" por"
 
-#: templates/question.html:263
-msgid "close date "
-msgstr "fecha de cierre"
+#: templates/question.html:262
+#, python-format
+msgid "close date %(question.closed_at)s"
+msgstr "fecha de cerrada %(question.closed_at)s"
 
-#: templates/question.html:270 templates/user_stats.html:13
+#: templates/question.html:269 templates/user_stats.html:28
 msgid "Answers"
 msgstr "Respuestas"
 
-#: templates/question.html:272
+#: templates/question.html:271
 msgid "oldest answers will be shown first"
 msgstr "la respuesta mas vieja será mostrada primero"
 
-#: templates/question.html:272
+#: templates/question.html:271
 msgid "oldest answers"
 msgstr "pregunta más vieja"
 
-#: templates/question.html:273
+#: templates/question.html:272
 msgid "newest answers will be shown first"
 msgstr "preguntas más nuevas serán mostradas primero"
 
-#: templates/question.html:273
+#: templates/question.html:272
 msgid "newest answers"
 msgstr "más nuevas"
 
-#: templates/question.html:274
+#: 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:274
+#: templates/question.html:273
 msgid "popular answers"
 msgstr "respuestas populares"
 
-#: templates/question.html:288 templates/question.html.py:289
+#: 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:295 templates/question.html.py:296
+#: 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:301 templates/question.html.py:302
+#: 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:307 templates/question.html.py:308
+#: 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:330
+#: templates/question.html:329
 msgid "undelete"
 msgstr "deshacer eliminar"
 
-#: templates/question.html:340
+#: templates/question.html:339
 msgid "answer permanent link"
 msgstr "enlace permanente a respuesta"
 
-#: templates/question.html:341
+#: templates/question.html:340
 msgid "permanent link"
 msgstr "enlace permanente"
 
-#: templates/question.html:454
+#: templates/question.html:453
 msgid "Your answer"
 msgstr "Tu respuesta"
 
-#: templates/question.html:457
+#: 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:480
+#: templates/question.html:479
 msgid "Answer the question"
 msgstr "Responde la pregunta"
 
-#: templates/question.html:482
+#: templates/question.html:481
 msgid "Notify me daily if there are any new answers."
 msgstr "Notificarme diariamente si hay nuevas respuestas."
 
-#: templates/question.html:484
+#: 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:495
+#: templates/question.html:494
 msgid "Question tags"
 msgstr "Tags de la pregunta"
 
-#: templates/question.html:505
+#: templates/question.html:504
 msgid "question asked"
 msgstr "pregunta preguntada"
 
-#: templates/question.html:505 templates/question.html.py:511
+#: templates/question.html:504 templates/question.html.py:510
 #: templates/user_info.html:51
 msgid "ago"
 msgstr " atras"
 
-#: templates/question.html:508
+#: templates/question.html:507
 msgid "question was seen"
 msgstr "la pregunta fue vista"
 
-#: templates/question.html:508
+#: templates/question.html:507
 msgid "times"
 msgstr "veces"
 
-#: templates/question.html:511
+#: templates/question.html:510
 msgid "last updated"
 msgstr "última vez actualizada"
 
-#: templates/question.html:516
+#: templates/question.html:515
 msgid "Related questions"
 msgstr "Preguntas relacionadas"
 
@@ -1916,7 +1878,7 @@ msgstr "preguntas actualizadas más recientemente"
 msgid "active"
 msgstr "actividad"
 
-#: templates/questions.html:110
+#: templates/questions.html:109
 #, python-format
 msgid ""
 "\n"
@@ -1935,7 +1897,7 @@ msgstr[1] ""
 "\t\t\ttiene un total de %(q_num)s preguntas etiquetadas con %(tagname)s\n"
 "\t\t\t"
 
-#: templates/questions.html:117
+#: templates/questions.html:116
 #, python-format
 msgid ""
 "\n"
@@ -1954,7 +1916,7 @@ msgstr[1] ""
 "\t\t\thay un total de %(q_num)s pregunta que contiene %(searchtitle)s\n"
 "\t\t\t"
 
-#: templates/questions.html:123
+#: templates/questions.html:122
 #, fuzzy, python-format
 msgid ""
 "\n"
@@ -1967,36 +1929,36 @@ msgid_plural ""
 msgstr[0] "ver preguntas etiquetadas '%(tagname)s'"
 msgstr[1] "ver pregunta etiquetada '%(tagname)s'"
 
-#: templates/questions.html:132
+#: templates/questions.html:131
 msgid "latest questions info"
 msgstr "<strong>Más recientes</strong> preguntas son mostradas primero."
 
-#: templates/questions.html:136
+#: templates/questions.html:135
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 "Las preguntas estan ordenadas por <strong>fecha de último update</strong>."
 
-#: templates/questions.html:137
+#: templates/questions.html:136
 msgid "Most recently answered ones are shown first."
 msgstr "Las más recientemente respondidas son mostradas primero."
 
-#: templates/questions.html:141
+#: templates/questions.html:140
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Preguntas ordenadas por <strong>número de respuestas</strong>."
 
-#: templates/questions.html:142
+#: templates/questions.html:141
 msgid "Most answered questions are shown first."
 msgstr "Preguntas más respondidas aparecen primero."
 
-#: templates/questions.html:146
+#: templates/questions.html:145
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr "Las preguntas son ordenadas por el <strong>número de votos</strong>."
 
-#: templates/questions.html:147
+#: templates/questions.html:146
 msgid "Most voted questions are shown first."
 msgstr "Las preguntas más votadas son mostradas primero."
 
-#: templates/questions.html:154 templates/unanswered.html:102
+#: templates/questions.html:153 templates/unanswered.html:102
 msgid "Related tags"
 msgstr "Etiquetas relacionadas"
 
@@ -2061,6 +2023,10 @@ msgstr "Todas las etiquetas que coincidan con la busqueda"
 msgid "all tags - make this empty in english"
 msgstr "todas las tags"
 
+#: templates/tags.html:42
+msgid "Nothing found"
+msgstr "Nada encontrado"
+
 #: templates/unanswered.html:7 templates/unanswered.html.py:18
 msgid "Unanswered questions"
 msgstr "Preguntas sin respuesta"
@@ -2160,50 +2126,41 @@ msgstr "Enviar mis respuestas a Twitter"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/user_stats.html:10
+#: templates/user_stats.html:16
 msgid "User questions"
 msgstr "Preguntas del usuario"
 
-#: templates/user_stats.html:20
+#: 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:20
+#: 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:28
+#: templates/user_stats.html:46
 #, python-format
 msgid "the answer has been commented %(comment_count)s times"
 msgstr "la respuesta ha sido comentada %(comment_count)s veces"
 
-#: templates/user_stats.html:36
-#, fuzzy
-msgid "Votes"
-msgstr "votos"
-
-#: templates/user_stats.html:41
-msgid "thumb up"
-msgstr ""
+#: templates/user_stats.html:60
+msgid "votes total"
+msgstr "votos totales"
 
-#: templates/user_stats.html:42
+#: templates/user_stats.html:69
 msgid "user has voted up this many times"
 msgstr "el usuario ha votado positivo esta cantidad de veces"
 
-#: templates/user_stats.html:46
-msgid "thumb down"
-msgstr ""
-
-#: templates/user_stats.html:47
+#: templates/user_stats.html:74
 msgid "user voted down this many times"
 msgstr "el usuario voto negativo esta cantidad de veces"
 
-#: templates/user_stats.html:54
+#: templates/user_stats.html:87
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: templates/user_stats.html:61
+#: templates/user_stats.html:97
 #, python-format
 msgid "see other questions tagged '%(tag)s' "
 msgstr "ver otras preguntas etiqueteadas '%(tag)s'"
@@ -2220,11 +2177,6 @@ msgstr "gráfica de la reputación del usuario"
 msgid "reputation history"
 msgstr "historial de reputación"
 
-#: templates/user_tabs.html:23
-#, fuzzy
-msgid "questions that user selected as his/her favorite"
-msgstr "esta pregunta ha sido seleccionada como favorita"
-
 #: templates/user_tabs.html:24
 msgid "favorites"
 msgstr "favoritos"
@@ -2262,15 +2214,7 @@ msgstr "Nada encontrado."
 msgid "this questions was selected as favorite"
 msgstr "esta pregunta ha sido seleccionada como favorita"
 
-#: templates/users_questions.html:12
-msgid "thumb-up on"
-msgstr ""
-
-#: templates/users_questions.html:19
-msgid "thumb-up off"
-msgstr ""
-
-#: templates/users_questions.html:35
+#: templates/users_questions.html:33
 msgid "this answer has been accepted to be correct"
 msgstr "esta respuesta ha sido aceptada como correcta"
 
@@ -2296,7 +2240,7 @@ msgid "Your new Email"
 msgstr "Tu nuevo Email"
 
 #: templates/authopenid/changeemail.html:31
-#: templates/authopenid/signin.html:137
+#: templates/authopenid/signin.html:136
 msgid "Password"
 msgstr "Contraseña"
 
@@ -2404,7 +2348,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/sendpw.html:16 templates/authopenid/signin.html:121
+#: templates/authopenid/signin.html:120
 msgid "Sorry, looks like we have some errors:"
 msgstr "Ups, parece que hay errores:"
 
@@ -2436,10 +2380,40 @@ msgstr "contraseña"
 msgid "Register"
 msgstr "Registrarse"
 
-#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:139
+#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
+#: templates/authopenid/confirm_email.txt:2
+msgid "Thank you for registering at our Q&A forum!"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:4
+msgid "Your account details are:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:6
+#: templates/authopenid/sendpw_email.txt:7
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: templates/authopenid/confirm_email.txt:7
+#: templates/authopenid/delete.html:20
+msgid "Password:"
+msgstr "Contraseña"
+
+#: templates/authopenid/confirm_email.txt:9
+msgid "Please sign in here:"
+msgstr ""
+
+#: templates/authopenid/confirm_email.txt:12
+#: templates/authopenid/email_validation.txt:14
+#: templates/authopenid/sendpw_email.txt:13
+msgid ""
+"Sincerely,\n"
+"Forum Administrator"
+msgstr ""
+
 #: templates/authopenid/delete.html:9
 msgid "Account: delete account"
 msgstr "Cuenta: borrar cuenta"
@@ -2456,10 +2430,6 @@ msgstr ""
 msgid "Check confirm box, if you want delete your account."
 msgstr "Marca caja de confirmación, si deseas borrar tu cuenta."
 
-#: templates/authopenid/delete.html:20
-msgid "Password:"
-msgstr "Contraseña"
-
 #: templates/authopenid/delete.html:32
 msgid "I am sure I want to delete my account."
 msgstr "Estoy seguro que quiero borrar mi cuenta."
@@ -2476,6 +2446,25 @@ msgstr "(requerido por tu seguridad)"
 msgid "Delete account permanently"
 msgstr "Borrar la cuenta de forma permanente"
 
+#: templates/authopenid/email_validation.txt:2
+msgid "Greetings from the Q&A forum"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:4
+msgid "To make use of the Forum, please follow the link below:"
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:8
+msgid "Following the link above will help us verify your email address."
+msgstr ""
+
+#: templates/authopenid/email_validation.txt:10
+msgid ""
+"If you beleive that this message was sent in mistake - \n"
+"no further action is needed. Just ingore this email, we apologize\n"
+"for any inconvenience"
+msgstr ""
+
 #: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:8
 msgid "Send new password"
 msgstr "Enviar nueva contraseña"
@@ -2512,6 +2501,26 @@ 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/sendpw_email.txt:2
+#, python-format
+msgid ""
+"Someone has requested to reset your password on %(site_url)s.\n"
+"If it were not you, it is safe to ignore this email."
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:5
+msgid "Your new account details are:"
+msgstr ""
+
+#: templates/authopenid/sendpw_email.txt:8
+#, fuzzy
+msgid "New password:"
+msgstr "Nueva contraseña:"
+
+#: templates/authopenid/sendpw_email.txt:10
+msgid "To confirm that you wanted to reset your password please visit:"
+msgstr ""
+
 #: templates/authopenid/settings.html:30
 msgid "Give your  account a new password."
 msgstr "Crea una nueva contraseña para tu cuenta."
@@ -2580,7 +2589,7 @@ msgstr ""
 "Ingresa tu dirección (URL) de <a class=\"openid_logo\" href=\"http://openid."
 "net\">OpenID</a>"
 
-#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:138
+#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137
 msgid "Login"
 msgstr "Ingresar"
 
@@ -2588,48 +2597,48 @@ msgstr "Ingresar"
 msgid "we support two login modes"
 msgstr "soportamos dos tipos de ingreso"
 
-#: templates/authopenid/signin.html:135
+#: templates/authopenid/signin.html:134
 msgid "Use login name and password"
 msgstr "Nombre de usuario y contraseña"
 
-#: templates/authopenid/signin.html:136
+#: templates/authopenid/signin.html:135
 msgid "Login name"
 msgstr "Nombre de usuario"
 
-#: templates/authopenid/signin.html:140
+#: templates/authopenid/signin.html:139
 msgid "Create new account"
 msgstr "Crear cuenta nueva"
 
-#: templates/authopenid/signin.html:149
+#: templates/authopenid/signin.html:148
 msgid "Why use OpenID?"
 msgstr "¿Porqué usar OpenID?"
 
-#: templates/authopenid/signin.html:152
+#: 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:155
+#: 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:158
+#: 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:161
+#: 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:166
+#: templates/authopenid/signin.html:165
 msgid "Find out more"
 msgstr "Averigua más"
 
-#: templates/authopenid/signin.html:167
+#: templates/authopenid/signin.html:166
 msgid "Get OpenID"
 msgstr "Adquiere una OpenID"
 
@@ -2673,20 +2682,6 @@ msgstr "Registrate con tu OpenID"
 msgid "Login with your OpenID"
 msgstr "Ingresar con tu OpenID"
 
-#, fuzzy
-#~ msgid "complete list of quesionts"
-#~ msgstr "lista completa de preguntas"
-
-#~ msgid "votes total"
-#~ msgstr "votos totales"
-
-#~ msgid "Username:"
-#~ msgstr "Nombre de usuario:"
-
-#, fuzzy
-#~ msgid "New password:"
-#~ msgstr "Nueva contraseña:"
-
 #~ msgid "site title"
 #~ msgstr "Preguntalo.com.uy"
 
-- 
cgit v1.2.3-1-g7c22


From 4be0491e6adef6bf5817545ec9e050555066352f Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 9 Dec 2009 12:13:32 -0500
Subject: better selector of ignored questions, split javascript tag_selector
 into separate file, fixed question counter messages in the english lang file

---
 locale/en/LC_MESSAGES/django.mo | Bin 25611 -> 26686 bytes
 locale/en/LC_MESSAGES/django.po | 854 +++++++++++++++++++++++++---------------
 2 files changed, 542 insertions(+), 312 deletions(-)

(limited to 'locale')

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 502c1075..16f3554d 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 18eb61b1..15385964 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-11-10 19:00-0800\n"
+"POT-Creation-Date: 2009-12-09 08:54-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -60,87 +60,95 @@ msgstr ""
 msgid "this email is already used by someone else, please choose another"
 msgstr ""
 
-#: django_authopenid/forms.py:163 django_authopenid/views.py:117
+#: django_authopenid/forms.py:163 django_authopenid/views.py:118
 msgid "i-names are not supported"
 msgstr ""
 
-#: django_authopenid/forms.py:239
+#: django_authopenid/forms.py:219
+msgid "Account with this name already exists on the forum"
+msgstr ""
+
+#: django_authopenid/forms.py:220
+msgid "can't have two logins to the same account yet, sorry."
+msgstr ""
+
+#: django_authopenid/forms.py:242
 msgid "Please enter valid username and password (both are case-sensitive)."
 msgstr ""
 
-#: django_authopenid/forms.py:242 django_authopenid/forms.py:292
+#: django_authopenid/forms.py:245 django_authopenid/forms.py:295
 msgid "This account is inactive."
 msgstr ""
 
-#: django_authopenid/forms.py:244
+#: django_authopenid/forms.py:247
 msgid "Login failed."
 msgstr ""
 
-#: django_authopenid/forms.py:246
+#: django_authopenid/forms.py:249
 msgid "Please enter username and password"
 msgstr ""
 
-#: django_authopenid/forms.py:248
+#: django_authopenid/forms.py:251
 msgid "Please enter your password"
 msgstr ""
 
-#: django_authopenid/forms.py:250
+#: django_authopenid/forms.py:253
 msgid "Please enter user name"
 msgstr ""
 
-#: django_authopenid/forms.py:288
+#: django_authopenid/forms.py:291
 msgid ""
 "Please enter a valid                     username and password. Note that "
 "both fields are                     case-sensitive."
 msgstr ""
 
-#: django_authopenid/forms.py:310
+#: django_authopenid/forms.py:313
 msgid "choose password"
 msgstr "Password"
 
-#: django_authopenid/forms.py:311
+#: django_authopenid/forms.py:314
 msgid "password is required"
 msgstr ""
 
-#: django_authopenid/forms.py:314
+#: django_authopenid/forms.py:317
 msgid "retype password"
 msgstr "Password <i>(please retype)</i>"
 
-#: django_authopenid/forms.py:315
+#: django_authopenid/forms.py:318
 msgid "please, retype your password"
 msgstr ""
 
-#: django_authopenid/forms.py:316
+#: django_authopenid/forms.py:319
 msgid "sorry, entered passwords did not match, please try again"
 msgstr ""
 
-#: django_authopenid/forms.py:341
+#: django_authopenid/forms.py:344
 msgid "Current password"
 msgstr ""
 
-#: django_authopenid/forms.py:343
+#: django_authopenid/forms.py:346
 msgid "New password"
 msgstr ""
 
-#: django_authopenid/forms.py:345
+#: django_authopenid/forms.py:348
 msgid "Retype new password"
 msgstr ""
 
-#: django_authopenid/forms.py:356
+#: django_authopenid/forms.py:359
 msgid ""
 "Old password is incorrect.                     Please enter the correct "
 "password."
 msgstr ""
 
-#: django_authopenid/forms.py:368
+#: django_authopenid/forms.py:371
 msgid "new passwords do not match"
 msgstr ""
 
-#: django_authopenid/forms.py:432
+#: django_authopenid/forms.py:435
 msgid "Your user name (<i>required</i>)"
 msgstr ""
 
-#: django_authopenid/forms.py:447
+#: django_authopenid/forms.py:450
 msgid "Incorrect username."
 msgstr "sorry, there is no such user name"
 
@@ -218,87 +226,87 @@ msgstr ""
 msgid "openid/"
 msgstr ""
 
-#: django_authopenid/urls.py:30 forum/urls.py:43 forum/urls.py:47
+#: django_authopenid/urls.py:30 forum/urls.py:44 forum/urls.py:48
 msgid "delete/"
 msgstr ""
 
-#: django_authopenid/views.py:123
+#: django_authopenid/views.py:124
 #, python-format
 msgid "OpenID %(openid_url)s is invalid"
 msgstr ""
 
-#: django_authopenid/views.py:531
+#: django_authopenid/views.py:532
 msgid "Welcome email subject line"
 msgstr "Welcome to the Q&A forum"
 
-#: django_authopenid/views.py:626
+#: django_authopenid/views.py:627
 msgid "Password changed."
 msgstr ""
 
-#: django_authopenid/views.py:638 django_authopenid/views.py:644
+#: django_authopenid/views.py:639 django_authopenid/views.py:645
 #, python-format
 msgid "your email needs to be validated see %(details_url)s"
 msgstr ""
 "Your email needs to be validated. Please see details <a "
 "id='validate_email_alert' href='%(details_url)s'>here</a>."
 
-#: django_authopenid/views.py:665
+#: django_authopenid/views.py:666
 msgid "Email verification subject line"
 msgstr "Verification Email from Q&A forum"
 
-#: django_authopenid/views.py:751
+#: django_authopenid/views.py:752
 msgid "your email was not changed"
 msgstr ""
 
-#: django_authopenid/views.py:798 django_authopenid/views.py:950
+#: django_authopenid/views.py:799 django_authopenid/views.py:951
 #, python-format
 msgid "No OpenID %s found associated in our database"
 msgstr ""
 
-#: django_authopenid/views.py:802 django_authopenid/views.py:957
+#: django_authopenid/views.py:803 django_authopenid/views.py:958
 #, python-format
 msgid "The OpenID %s isn't associated to current user logged in"
 msgstr ""
 
-#: django_authopenid/views.py:810
+#: django_authopenid/views.py:811
 msgid "Email Changed."
 msgstr ""
 
-#: django_authopenid/views.py:885
+#: django_authopenid/views.py:886
 msgid "This OpenID is already associated with another account."
 msgstr ""
 
-#: django_authopenid/views.py:890
+#: django_authopenid/views.py:891
 #, python-format
 msgid "OpenID %s is now associated with your account."
 msgstr ""
 
-#: django_authopenid/views.py:960
+#: django_authopenid/views.py:961
 msgid "Account deleted."
 msgstr ""
 
-#: django_authopenid/views.py:1003
+#: django_authopenid/views.py:1004
 msgid "Request for new password"
 msgstr ""
 
-#: django_authopenid/views.py:1016
+#: django_authopenid/views.py:1017
 msgid "A new password and the activation link were sent to your email address."
 msgstr ""
 
-#: django_authopenid/views.py:1046
+#: django_authopenid/views.py:1047
 #, python-format
 msgid ""
 "Could not change password. Confirmation key '%s'                is not "
 "registered."
 msgstr ""
 
-#: django_authopenid/views.py:1055
+#: django_authopenid/views.py:1056
 msgid ""
 "Can not change password. User don't exist anymore                 in our "
 "database."
 msgstr ""
 
-#: django_authopenid/views.py:1064
+#: django_authopenid/views.py:1065
 #, python-format
 msgid "Password changed for %s. You may now sign in."
 msgstr ""
@@ -351,90 +359,102 @@ msgstr ""
 msgid "spam or advertising"
 msgstr ""
 
-#: forum/const.py:56
+#: forum/const.py:57
 msgid "question"
 msgstr ""
 
-#: forum/const.py:57 templates/book.html:110
+#: forum/const.py:58 templates/book.html:110
 msgid "answer"
 msgstr ""
 
-#: forum/const.py:58
+#: forum/const.py:59
 msgid "commented question"
 msgstr ""
 
-#: forum/const.py:59
+#: forum/const.py:60
 msgid "commented answer"
 msgstr ""
 
-#: forum/const.py:60
+#: forum/const.py:61
 msgid "edited question"
 msgstr ""
 
-#: forum/const.py:61
+#: forum/const.py:62
 msgid "edited answer"
 msgstr ""
 
-#: forum/const.py:62
+#: forum/const.py:63
 msgid "received award"
 msgstr "received badge"
 
-#: forum/const.py:63
+#: forum/const.py:64
 msgid "marked best answer"
 msgstr ""
 
-#: forum/const.py:64
+#: forum/const.py:65
 msgid "upvoted"
 msgstr ""
 
-#: forum/const.py:65
+#: forum/const.py:66
 msgid "downvoted"
 msgstr ""
 
-#: forum/const.py:66
+#: forum/const.py:67
 msgid "canceled vote"
 msgstr ""
 
-#: forum/const.py:67
+#: forum/const.py:68
 msgid "deleted question"
 msgstr ""
 
-#: forum/const.py:68
+#: forum/const.py:69
 msgid "deleted answer"
 msgstr ""
 
-#: forum/const.py:69
+#: forum/const.py:70
 msgid "marked offensive"
 msgstr ""
 
-#: forum/const.py:70
+#: forum/const.py:71
 msgid "updated tags"
 msgstr ""
 
-#: forum/const.py:71
+#: forum/const.py:72
 msgid "selected favorite"
 msgstr ""
 
-#: forum/const.py:72
+#: forum/const.py:73
 msgid "completed user profile"
 msgstr ""
 
-#: forum/const.py:83
+#: forum/const.py:74
+msgid "email update sent to user"
+msgstr ""
+
+#: forum/const.py:85
 msgid "[closed]"
 msgstr ""
 
-#: forum/const.py:84
+#: forum/const.py:86
 msgid "[deleted]"
 msgstr ""
 
-#: forum/const.py:85
+#: forum/const.py:87 forum/views.py:849 forum/views.py:868
 msgid "initial version"
 msgstr ""
 
-#: forum/const.py:86
+#: forum/const.py:88
 msgid "retagged"
 msgstr ""
 
+#: forum/const.py:92
+msgid "exclude ignored tags"
+msgstr ""
+
+#: forum/const.py:92
+msgid "allow only interesting tags"
+msgstr ""
+
 #: forum/feed.py:18
 msgid " - "
 msgstr ""
@@ -443,10 +463,8 @@ msgstr ""
 msgid "latest questions"
 msgstr ""
 
-#: forum/feed.py:19 forum/urls.py:32 forum/urls.py:33 forum/urls.py:34
-#: forum/urls.py:35 forum/urls.py:36 forum/urls.py:37 forum/urls.py:38
-#: forum/urls.py:39 forum/urls.py:40 forum/urls.py:41 forum/urls.py:43
-msgid "questions/"
+#: forum/feed.py:19 forum/urls.py:52
+msgid "question/"
 msgstr ""
 
 #: forum/forms.py:16 templates/answer_edit_tips.html:35
@@ -471,7 +489,7 @@ msgstr ""
 msgid "question content must be > 10 characters"
 msgstr ""
 
-#: forum/forms.py:47 templates/header.html:29 templates/header.html.py:63
+#: forum/forms.py:47 templates/header.html:28 templates/header.html.py:62
 msgid "tags"
 msgstr ""
 
@@ -498,11 +516,11 @@ msgid ""
 "characters '.-_#'"
 msgstr ""
 
-#: forum/forms.py:79 templates/index.html:59 templates/index.html.py:71
+#: forum/forms.py:79 templates/index.html:61 templates/index.html.py:73
 #: templates/post_contributor_info.html:7
 #: templates/question_summary_list_roll.html:26
-#: templates/question_summary_list_roll.html:38 templates/questions.html:59
-#: templates/questions.html.py:71 templates/unanswered.html:51
+#: templates/question_summary_list_roll.html:38 templates/questions.html:92
+#: templates/questions.html.py:104 templates/unanswered.html:51
 #: templates/unanswered.html.py:63
 msgid "community wiki"
 msgstr ""
@@ -544,119 +562,139 @@ msgid "this email does not have to be linked to gravatar"
 msgstr ""
 
 #: forum/forms.py:198
-msgid "Real name"
+msgid "Screen name"
 msgstr ""
 
 #: forum/forms.py:199
-msgid "Website"
+msgid "Real name"
 msgstr ""
 
 #: forum/forms.py:200
-msgid "Location"
+msgid "Website"
 msgstr ""
 
 #: forum/forms.py:201
+msgid "Location"
+msgstr ""
+
+#: forum/forms.py:202
 msgid "Date of birth"
 msgstr ""
 
-#: forum/forms.py:201
+#: forum/forms.py:202
 msgid "will not be shown, used to calculate age, format: YYYY-MM-DD"
 msgstr ""
 
-#: forum/forms.py:202 templates/authopenid/settings.html:21
+#: forum/forms.py:203 templates/authopenid/settings.html:21
 msgid "Profile"
 msgstr ""
 
-#: forum/forms.py:229 forum/forms.py:230
+#: forum/forms.py:231 forum/forms.py:232
 msgid "this email has already been registered, please use another one"
 msgstr ""
 
-#: forum/forms.py:234 forum/forms.py:235
+#: forum/forms.py:238
+msgid "Choose email tag filter"
+msgstr ""
+
+#: forum/forms.py:245 forum/forms.py:246
 msgid "weekly"
 msgstr ""
 
-#: forum/forms.py:234 forum/forms.py:235
+#: forum/forms.py:245 forum/forms.py:246
 msgid "no email"
 msgstr ""
 
-#: forum/forms.py:235
+#: forum/forms.py:246
 msgid "daily"
 msgstr ""
 
-#: forum/forms.py:250 forum/models.py:46
-msgid "Entire forum"
-msgstr ""
-
-#: forum/forms.py:253
+#: forum/forms.py:261
 msgid "Asked by me"
 msgstr ""
 
-#: forum/forms.py:256
+#: forum/forms.py:264
 msgid "Answered by me"
 msgstr ""
 
-#: forum/forms.py:259
+#: forum/forms.py:267
 msgid "Individually selected"
 msgstr ""
 
-#: forum/models.py:47
+#: forum/forms.py:270
+msgid "Entire forum (tag filtered)"
+msgstr ""
+
+#: forum/models.py:51
+msgid "Entire forum"
+msgstr ""
+
+#: forum/models.py:52
 msgid "Questions that I asked"
 msgstr ""
 
-#: forum/models.py:48
+#: forum/models.py:53
 msgid "Questions that I answered"
 msgstr ""
 
-#: forum/models.py:49
+#: forum/models.py:54
 msgid "Individually selected questions"
 msgstr ""
 
-#: forum/models.py:52
+#: forum/models.py:57
 msgid "Weekly"
 msgstr ""
 
-#: forum/models.py:53
+#: forum/models.py:58
 msgid "Daily"
 msgstr ""
 
-#: forum/models.py:54
+#: forum/models.py:59
 msgid "No email"
 msgstr ""
 
-#: forum/models.py:289
+#: forum/models.py:301
 #, python-format
 msgid "%(author)s modified the question"
 msgstr ""
 
-#: forum/models.py:293
+#: forum/models.py:305
 #, python-format
 msgid "%(people)s posted %(new_answer_count)s new answers"
 msgstr ""
 
-#: forum/models.py:298
+#: forum/models.py:310
 #, python-format
 msgid "%(people)s commented the question"
 msgstr ""
 
-#: forum/models.py:303
+#: forum/models.py:315
 #, python-format
 msgid "%(people)s commented answers"
 msgstr ""
 
-#: forum/models.py:305
+#: forum/models.py:317
 #, python-format
 msgid "%(people)s commented an answer"
 msgstr ""
 
-#: forum/models.py:493 templates/badges.html:53
+#: forum/models.py:348
+msgid "interesting"
+msgstr ""
+
+#: forum/models.py:348
+msgid "ignored"
+msgstr ""
+
+#: forum/models.py:511 templates/badges.html:53
 msgid "gold"
 msgstr ""
 
-#: forum/models.py:494 templates/badges.html:61
+#: forum/models.py:512 templates/badges.html:61
 msgid "silver"
 msgstr ""
 
-#: forum/models.py:495 templates/badges.html:68
+#: forum/models.py:513 templates/badges.html:68
 msgid "bronze"
 msgstr ""
 
@@ -680,15 +718,15 @@ msgstr ""
 msgid "logout/"
 msgstr ""
 
-#: forum/urls.py:29 forum/urls.py:30 forum/urls.py:31 forum/urls.py:47
+#: forum/urls.py:29 forum/urls.py:30 forum/urls.py:31 forum/urls.py:48
 msgid "answers/"
 msgstr ""
 
-#: forum/urls.py:29 forum/urls.py:41 forum/urls.py:43 forum/urls.py:47
+#: forum/urls.py:29 forum/urls.py:41 forum/urls.py:44 forum/urls.py:48
 msgid "comments/"
 msgstr ""
 
-#: forum/urls.py:30 forum/urls.py:35 forum/urls.py:56
+#: forum/urls.py:30 forum/urls.py:35 forum/urls.py:70
 #: templates/user_info.html:45
 msgid "edit/"
 msgstr ""
@@ -697,7 +735,13 @@ msgstr ""
 msgid "revisions/"
 msgstr ""
 
-#: forum/urls.py:33 forum/urls.py:66
+#: forum/urls.py:32 forum/urls.py:33 forum/urls.py:34 forum/urls.py:35
+#: forum/urls.py:36 forum/urls.py:37 forum/urls.py:38 forum/urls.py:39
+#: forum/urls.py:40 forum/urls.py:41 forum/urls.py:44
+msgid "questions/"
+msgstr ""
+
+#: forum/urls.py:33 forum/urls.py:80
 msgid "ask/"
 msgstr ""
 
@@ -721,55 +765,71 @@ msgstr ""
 msgid "vote/"
 msgstr ""
 
-#: forum/urls.py:51
-msgid "question/"
+#: forum/urls.py:42
+msgid "command/"
 msgstr ""
 
-#: forum/urls.py:52 forum/urls.py:53
+#: forum/urls.py:53 forum/urls.py:54
 msgid "tags/"
 msgstr ""
 
-#: forum/urls.py:54 forum/urls.py:56 forum/urls.py:57
+#: forum/urls.py:56 forum/urls.py:60
+msgid "mark-tag/"
+msgstr ""
+
+#: forum/urls.py:56
+msgid "interesting/"
+msgstr ""
+
+#: forum/urls.py:60
+msgid "ignored/"
+msgstr ""
+
+#: forum/urls.py:64
+msgid "unmark-tag/"
+msgstr ""
+
+#: forum/urls.py:68 forum/urls.py:70 forum/urls.py:71
 msgid "users/"
 msgstr ""
 
-#: forum/urls.py:55
+#: forum/urls.py:69
 msgid "moderate-user/"
 msgstr ""
 
-#: forum/urls.py:58 forum/urls.py:59
+#: forum/urls.py:72 forum/urls.py:73
 msgid "badges/"
 msgstr ""
 
-#: forum/urls.py:60
+#: forum/urls.py:74
 msgid "messages/"
 msgstr ""
 
-#: forum/urls.py:60
+#: forum/urls.py:74
 msgid "markread/"
 msgstr ""
 
-#: forum/urls.py:62
+#: forum/urls.py:76
 msgid "nimda/"
 msgstr ""
 
-#: forum/urls.py:64
+#: forum/urls.py:78
 msgid "upload/"
 msgstr ""
 
-#: forum/urls.py:65 forum/urls.py:66 forum/urls.py:67
+#: forum/urls.py:79 forum/urls.py:80 forum/urls.py:81
 msgid "books/"
 msgstr ""
 
-#: forum/urls.py:68
+#: forum/urls.py:82
 msgid "search/"
 msgstr ""
 
-#: forum/urls.py:69
+#: forum/urls.py:83
 msgid "feedback/"
 msgstr ""
 
-#: forum/urls.py:70
+#: forum/urls.py:84
 msgid "account/"
 msgstr ""
 
@@ -857,118 +917,144 @@ msgstr ""
 msgid "profile - email subscriptions"
 msgstr ""
 
-#: forum/views.py:126
+#: forum/views.py:141
 msgid "Q&A forum feedback"
 msgstr ""
 
-#: forum/views.py:127
+#: forum/views.py:142
 msgid "Thanks for the feedback!"
 msgstr ""
 
-#: forum/views.py:135
+#: forum/views.py:150
 msgid "We look forward to hearing your feedback! Please, give it next time :)"
 msgstr ""
 
-#: forum/views.py:1014
+#: forum/views.py:1150
 #, python-format
 msgid "subscription saved, %(email)s needs validation, see %(details_url)s"
 msgstr ""
 "Your subscription is saved, but email address %(email)s needs to be "
 "validated, please see <a href='%(details_url)s'>more details here</a>"
 
-#: forum/views.py:1022
+#: forum/views.py:1158
 msgid "email update frequency has been set to daily"
 msgstr ""
 
-#: forum/views.py:1826
+#: forum/views.py:2032
 msgid "changes saved"
 msgstr ""
 
-#: forum/views.py:1832
+#: forum/views.py:2038
 msgid "email updates canceled"
 msgstr ""
 
-#: forum/views.py:1999
+#: forum/views.py:2207
 msgid "uploading images is limited to users with >60 reputation points"
 msgstr "sorry, file uploading requires karma >60"
 
-#: forum/views.py:2001
+#: forum/views.py:2209
 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'"
 msgstr ""
 
-#: forum/views.py:2003
+#: forum/views.py:2211
 #, python-format
 msgid "maximum upload file size is %sK"
 msgstr ""
 
-#: forum/views.py:2005
+#: forum/views.py:2213
 #, python-format
 msgid ""
 "Error uploading file. Please contact the site administrator. Thank you. %s"
 msgstr ""
 
-#: forum/management/commands/send_email_alerts.py:71
+#: forum/management/commands/send_email_alerts.py:160
 msgid "email update message subject"
 msgstr "news from Q&A forum"
 
-#: forum/management/commands/send_email_alerts.py:72
+#: forum/management/commands/send_email_alerts.py:161
 #, python-format
 msgid "%(name)s, this is an update message header for a question"
 msgid_plural "%(name)s, this is an update message header for %(num)d questions"
-msgstr[0] "<p>Dear %(name)s,</p></p>The following question has been updated on the Q&A forum:</p>"
-msgstr[1] "<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on the Q&A forum:</p>"
+msgstr[0] ""
+"<p>Dear %(name)s,</p></p>The following question has been updated on the Q&A "
+"forum:</p>"
+msgstr[1] ""
+"<p>Dear %(name)s,</p><p>The following %(num)d questions have been updated on "
+"the Q&A forum:</p>"
+
+#: forum/management/commands/send_email_alerts.py:172
+msgid "new question"
+msgstr ""
+
+#: forum/management/commands/send_email_alerts.py:182
+#, python-format
+msgid "There is also one question which was recently "
+msgid_plural ""
+"There are also %(num)d more questions which were recently updated "
+msgstr[0] ""
+msgstr[1] ""
+
+#: forum/management/commands/send_email_alerts.py:187
+msgid ""
+"Perhaps you could look up previously sent forum reminders in your mailbox."
+msgstr ""
 
-#: forum/management/commands/send_email_alerts.py:81
+#: forum/management/commands/send_email_alerts.py:191
 #, python-format
 msgid ""
 "go to %(link)s to change frequency of email updates or %(email)s "
 "administrator"
 msgstr ""
-"<p>Please remember that you can always <a href='%(link)s'>adjust</a> frequency of the "
-"email updates or turn them off entirely.<br/>If you believe that this message "
-"was sent in an error, please email about it the forum administrator at %(email)"
-"s.</p>"
-"<p>Sincerely,</p><p>Your friendly Q&A forum server.</p>"
+"<p>Please remember that you can always <a href='%(link)s'>adjust</a> "
+"frequency of the email updates or turn them off entirely.<br/>If you believe "
+"that this message was sent in an error, please email about it the forum "
+"administrator at %(email)s.</p><p>Sincerely,</p><p>Your friendly Q&A forum "
+"server.</p>"
 
-#: forum/templatetags/extra_tags.py:160 forum/templatetags/extra_tags.py:189
-#: templates/header.html:34
+#: forum/templatetags/extra_tags.py:163 forum/templatetags/extra_tags.py:192
+#: templates/header.html:33
 msgid "badges"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:161 forum/templatetags/extra_tags.py:188
+#: forum/templatetags/extra_tags.py:164 forum/templatetags/extra_tags.py:191
 msgid "reputation points"
 msgstr "karma"
 
-#: forum/templatetags/extra_tags.py:244
+#: forum/templatetags/extra_tags.py:247
 msgid "%b %d at %H:%M"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:246
+#: forum/templatetags/extra_tags.py:249
 msgid "%b %d '%y at %H:%M"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:248
+#: forum/templatetags/extra_tags.py:251
 msgid "2 days ago"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:250
+#: forum/templatetags/extra_tags.py:253
 msgid "yesterday"
 msgstr ""
 
-#: forum/templatetags/extra_tags.py:252
+#: forum/templatetags/extra_tags.py:255
 #, python-format
 msgid "%(hr)d hour ago"
 msgid_plural "%(hr)d hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: forum/templatetags/extra_tags.py:254
+#: forum/templatetags/extra_tags.py:257
 #, python-format
 msgid "%(min)d min ago"
 msgid_plural "%(min)d mins ago"
 msgstr[0] ""
 msgstr[1] ""
 
+#: middleware/anon_user.py:33
+#, python-format
+msgid "first time greeting with %(url)s"
+msgstr ""
+
 #: templates/404.html:24
 msgid "Sorry, could not find the page you requested."
 msgstr ""
@@ -1035,13 +1121,46 @@ msgstr ""
 msgid "About"
 msgstr ""
 
+#: templates/about.html:21
+msgid ""
+"<strong>CNPROG <span class=\"orange\">Q&amp;A</span></strong> is a "
+"collaboratively edited question\n"
+"            and answer site created for the <strong>CNPROG</strong> "
+"community.\n"
+"    "
+msgstr ""
+
+#: templates/about.html:25
+msgid ""
+"Here you can <strong>ask</strong> and <strong>answer</strong> questions, "
+"<strong>comment</strong>\n"
+"    and <strong>vote</strong> for the questions of others and their answers. "
+"Both questions and answers\n"
+"    <strong>can be revised</strong> and improved. Questions can be "
+"<strong>tagged</strong> with\n"
+"    the relevant keywords to simplify future access and organize the "
+"accumulated material."
+msgstr ""
+
+#: templates/about.html:31
+msgid ""
+"This <span class=\"orange\">Q&amp;A</span> site is moderated by its members, "
+"hopefully - including yourself!\n"
+"    Moderation rights are gradually assigned to the site users based on the "
+"accumulated <strong>\"reputation\"</strong>\n"
+"    points. These points are added to the users account when others vote for "
+"his/her questions or answers.\n"
+"    These points (very) roughly reflect the level of trust of the community."
+msgstr ""
+
 #: templates/answer_edit.html:5 templates/answer_edit.html.py:48
 msgid "Edit answer"
 msgstr ""
 
 #: templates/answer_edit.html:25 templates/answer_edit.html.py:28
 #: templates/ask.html:26 templates/ask.html.py:29 templates/question.html:45
-#: templates/question.html.py:48 templates/question_edit.html:28
+#: templates/question.html.py:48 templates/question_edit.html:25
+#: templates/question_edit.html.py:28
 msgid "hide preview"
 msgstr ""
 
@@ -1051,13 +1170,13 @@ msgid "show preview"
 msgstr ""
 
 #: templates/answer_edit.html:48 templates/question_edit.html:66
-#: templates/question_retag.html:53 templates/revisions_answer.html:36
-#: templates/revisions_question.html:36
+#: templates/question_retag.html:53 templates/revisions_answer.html:38
+#: templates/revisions_question.html:38
 msgid "back"
 msgstr ""
 
 #: templates/answer_edit.html:53 templates/question_edit.html:71
-#: templates/revisions_answer.html:50 templates/revisions_question.html:50
+#: templates/revisions_answer.html:52 templates/revisions_question.html:52
 msgid "revision"
 msgstr ""
 
@@ -1083,7 +1202,7 @@ msgstr ""
 #: templates/answer_edit.html:73 templates/close.html:29
 #: templates/feedback.html:50 templates/question_edit.html:119
 #: templates/question_retag.html:75 templates/reopen.html:30
-#: templates/user_edit.html:83 templates/authopenid/changeemail.html:40
+#: templates/user_edit.html:87 templates/authopenid/changeemail.html:40
 msgid "Cancel"
 msgstr ""
 
@@ -1315,8 +1434,8 @@ msgstr ""
 msgid "number of times"
 msgstr ""
 
-#: templates/book.html:105 templates/index.html:47
-#: templates/question_summary_list_roll.html:14 templates/questions.html:47
+#: templates/book.html:105 templates/index.html:49
+#: templates/question_summary_list_roll.html:14 templates/questions.html:80
 #: templates/unanswered.html:39 templates/users_questions.html:32
 msgid "votes"
 msgstr ""
@@ -1325,17 +1444,17 @@ msgstr ""
 msgid "the answer has been accepted to be correct"
 msgstr ""
 
-#: templates/book.html:115 templates/index.html:48
-#: templates/question_summary_list_roll.html:15 templates/questions.html:48
+#: templates/book.html:115 templates/index.html:50
+#: templates/question_summary_list_roll.html:15 templates/questions.html:81
 #: templates/unanswered.html:40 templates/users_questions.html:40
 msgid "views"
 msgstr ""
 
-#: templates/book.html:125 templates/index.html:103
+#: templates/book.html:125 templates/index.html:105
 #: templates/question.html:480 templates/question_summary_list_roll.html:52
-#: templates/questions.html:103 templates/questions.html.py:171
-#: templates/tags.html:49 templates/unanswered.html:95
-#: templates/unanswered.html.py:122 templates/users_questions.html:52
+#: templates/questions.html:136 templates/tags.html:49
+#: templates/unanswered.html:95 templates/unanswered.html.py:122
+#: templates/users_questions.html:52
 msgid "using tags"
 msgstr ""
 
@@ -1343,7 +1462,7 @@ msgstr ""
 msgid "subscribe to book RSS feed"
 msgstr ""
 
-#: templates/book.html:147 templates/index.html:152
+#: templates/book.html:147 templates/index.html:156
 msgid "subscribe to the questions feed"
 msgstr ""
 
@@ -1453,7 +1572,7 @@ msgid ""
 "type of moderation task."
 msgstr ""
 
-#: templates/faq.html:53 templates/user_votes.html:14
+#: templates/faq.html:53 templates/user_votes.html:15
 msgid "upvote"
 msgstr ""
 
@@ -1465,7 +1584,7 @@ msgstr ""
 msgid "add comments"
 msgstr ""
 
-#: templates/faq.html:66 templates/user_votes.html:16
+#: templates/faq.html:66 templates/user_votes.html:17
 msgid "downvote"
 msgstr ""
 
@@ -1580,11 +1699,11 @@ msgstr ""
 "Please <a href='%(ask_question_url)s'>ask</a> your question, help make our "
 "community better!"
 
-#: templates/faq.html:128 templates/header.html:28 templates/header.html.py:62
+#: templates/faq.html:128 templates/header.html:27 templates/header.html.py:61
 msgid "questions"
 msgstr ""
 
-#: templates/faq.html:128 templates/index.html:157
+#: templates/faq.html:128 templates/index.html:161
 msgid "."
 msgstr ""
 
@@ -1646,32 +1765,28 @@ msgstr ""
 msgid "Message body:"
 msgstr ""
 
-#: templates/footer.html:8 templates/header.html:14 templates/index.html:117
+#: templates/footer.html:8 templates/header.html:13 templates/index.html:119
 msgid "about"
 msgstr ""
 
-#: templates/footer.html:9 templates/header.html:15 templates/index.html:118
+#: templates/footer.html:9 templates/header.html:14 templates/index.html:120
 #: templates/question_edit_tips.html:17
 msgid "faq"
 msgstr ""
 
 #: templates/footer.html:10
-msgid "wiki"
-msgstr ""
-
-#: templates/footer.html:11
 msgid "blog"
 msgstr ""
 
-#: templates/footer.html:12
+#: templates/footer.html:11
 msgid "contact us"
 msgstr ""
 
-#: templates/footer.html:13
+#: templates/footer.html:12
 msgid "privacy policy"
 msgstr ""
 
-#: templates/footer.html:22
+#: templates/footer.html:21
 msgid "give feedback"
 msgstr ""
 
@@ -1683,31 +1798,31 @@ msgstr ""
 msgid "login"
 msgstr ""
 
-#: templates/header.html:22
+#: templates/header.html:21
 msgid "back to home page"
 msgstr ""
 
-#: templates/header.html:30 templates/header.html.py:64
+#: templates/header.html:29 templates/header.html.py:63
 msgid "users"
 msgstr ""
 
-#: templates/header.html:32
+#: templates/header.html:31
 msgid "books"
 msgstr ""
 
-#: templates/header.html:35
+#: templates/header.html:34
 msgid "unanswered questions"
 msgstr "unanswered"
 
-#: templates/header.html:39
+#: templates/header.html:38
 msgid "my profile"
 msgstr ""
 
-#: templates/header.html:43
+#: templates/header.html:42
 msgid "ask a question"
 msgstr ""
 
-#: templates/header.html:58
+#: templates/header.html:57
 msgid "search"
 msgstr ""
 
@@ -1715,115 +1830,114 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: templates/index.html:23 templates/questions.html:8
+#: templates/index.html:25 templates/questions.html:8
 msgid "Questions"
 msgstr ""
 
-#: templates/index.html:25
+#: templates/index.html:27
 msgid "last updated questions"
 msgstr ""
 
-#: templates/index.html:25 templates/questions.html:26
+#: templates/index.html:27 templates/questions.html:47
 #: templates/unanswered.html:21
 msgid "newest"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:28 templates/questions.html:49
 msgid "hottest questions"
 msgstr ""
 
-#: templates/index.html:26 templates/questions.html:28
+#: templates/index.html:28 templates/questions.html:49
 msgid "hottest"
 msgstr ""
 
-#: templates/index.html:27 templates/questions.html:29
+#: templates/index.html:29 templates/questions.html:50
 msgid "most voted questions"
 msgstr ""
 
-#: templates/index.html:27 templates/questions.html:29
+#: templates/index.html:29 templates/questions.html:50
 msgid "most voted"
 msgstr ""
 
-#: templates/index.html:28
+#: templates/index.html:30
 msgid "all questions"
 msgstr ""
 
-#: templates/index.html:46 templates/question_summary_list_roll.html:13
-#: templates/questions.html:46 templates/unanswered.html:38
+#: templates/index.html:48 templates/question_summary_list_roll.html:13
+#: templates/questions.html:79 templates/unanswered.html:38
 #: templates/users_questions.html:36
 msgid "answers"
 msgstr ""
 
-#: templates/index.html:78 templates/index.html.py:92
-#: templates/questions.html:78 templates/questions.html.py:92
+#: templates/index.html:80 templates/index.html.py:94
+#: templates/questions.html:111 templates/questions.html.py:125
 #: templates/unanswered.html:70 templates/unanswered.html.py:84
 msgid "Posted:"
 msgstr ""
 
-#: templates/index.html:81 templates/index.html.py:86
-#: templates/questions.html:81 templates/questions.html.py:86
+#: templates/index.html:83 templates/index.html.py:88
+#: templates/questions.html:114 templates/questions.html.py:119
 #: templates/unanswered.html:73 templates/unanswered.html.py:78
 msgid "Updated:"
 msgstr ""
 
-#: templates/index.html:103 templates/question.html:480
-#: templates/question_summary_list_roll.html:52 templates/questions.html:103
-#: templates/questions.html.py:171 templates/tags.html:49
-#: templates/unanswered.html:95 templates/unanswered.html.py:122
-#: templates/users_questions.html:52
+#: templates/index.html:105 templates/question.html:480
+#: templates/question_summary_list_roll.html:52 templates/questions.html:136
+#: templates/tags.html:49 templates/unanswered.html:95
+#: templates/unanswered.html.py:122 templates/users_questions.html:52
 msgid "see questions tagged"
 msgstr ""
 
-#: templates/index.html:114
+#: templates/index.html:116
 msgid "welcome to website"
 msgstr "Welcome to Q&amp;A forum"
 
-#: templates/index.html:123
+#: templates/index.html:127
 msgid "Recent tags"
 msgstr ""
 
-#: templates/index.html:128 templates/question.html:135
+#: templates/index.html:132 templates/question.html:135
 #, python-format
 msgid "see questions tagged '%(tagname)s'"
 msgstr ""
 
-#: templates/index.html:131 templates/index.html.py:157
+#: templates/index.html:135 templates/index.html.py:161
 msgid "popular tags"
 msgstr "tags"
 
-#: templates/index.html:136
+#: templates/index.html:140
 msgid "Recent awards"
 msgstr "Recent badges"
 
-#: templates/index.html:142
+#: templates/index.html:146
 msgid "given to"
 msgstr ""
 
-#: templates/index.html:147
+#: templates/index.html:151
 msgid "all awards"
 msgstr "all badges"
 
-#: templates/index.html:152
+#: templates/index.html:156
 msgid "subscribe to last 30 questions by RSS"
 msgstr ""
 
-#: templates/index.html:157
+#: templates/index.html:161
 msgid "Still looking for more? See"
 msgstr ""
 
-#: templates/index.html:157
+#: templates/index.html:161
 msgid "complete list of questions"
 msgstr "list of all questions"
 
-#: templates/index.html:157 templates/authopenid/signup.html:18
+#: templates/index.html:161 templates/authopenid/signup.html:18
 msgid "or"
 msgstr ""
 
-#: templates/index.html:157
+#: templates/index.html:161
 msgid "Please help us answer"
 msgstr ""
 
-#: templates/index.html:157
+#: templates/index.html:161
 msgid "list of unanswered questions"
 msgstr "unanswered questions"
 
@@ -1836,8 +1950,8 @@ msgid ""
 "As a registered user you can login with your OpenID, log out of the site or "
 "permanently remove your account."
 msgstr ""
-"Clicking <strong>Logout</strong> will log you out from the forum"
-"but will not sign you off from your OpenID provider.</p><p>If you wish to sign off "
+"Clicking <strong>Logout</strong> will log you out from the forumbut will not "
+"sign you off from your OpenID provider.</p><p>If you wish to sign off "
 "completely - please make sure to log out from your OpenID provider as well."
 
 #: templates/logout.html:20
@@ -1881,17 +1995,19 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/post_contributor_info.html:19 templates/revisions_answer.html:66
-#: templates/revisions_question.html:66
+#: templates/post_contributor_info.html:19
 msgid "asked"
 msgstr ""
 
-#: templates/post_contributor_info.html:21
+#: templates/post_contributor_info.html:22
 msgid "answered"
 msgstr ""
 
-#: templates/post_contributor_info.html:37 templates/revisions_answer.html:68
-#: templates/revisions_question.html:68
+#: templates/post_contributor_info.html:24
+msgid "posted"
+msgstr ""
+
+#: templates/post_contributor_info.html:45
 msgid "updated"
 msgstr ""
 
@@ -1902,10 +2018,9 @@ msgstr ""
 #: templates/privacy.html:15
 msgid "general message about privacy"
 msgstr ""
-"Respecting users privacy is an important core principle "
-"of this Q&amp;A forum. "
-"Information on this page details how this forum protects your privacy, "
-"and what type of information is collected."
+"Respecting users privacy is an important core principle of this Q&amp;A "
+"forum. Information on this page details how this forum protects your "
+"privacy, and what type of information is collected."
 
 #: templates/privacy.html:18
 msgid "Site Visitors"
@@ -1914,9 +2029,9 @@ msgstr ""
 #: templates/privacy.html:20
 msgid "what technical information is collected about visitors"
 msgstr ""
-"Information on question views, revisions of questions and answers - both times "
-"and content are recorded for each user in order to correctly count number of views, "
-"maintain data integrity and report relevant updates."
+"Information on question views, revisions of questions and answers - both "
+"times and content are recorded for each user in order to correctly count "
+"number of views, maintain data integrity and report relevant updates."
 
 #: templates/privacy.html:23
 msgid "Personal Information"
@@ -1925,8 +2040,8 @@ msgstr ""
 #: templates/privacy.html:25
 msgid "details on personal information policies"
 msgstr ""
-"Members of this community may choose to display personally identifiable information "
-"in their profiles. Forum will never display such information "
+"Members of this community may choose to display personally identifiable "
+"information in their profiles. Forum will never display such information "
 "without a request from the user."
 
 #: templates/privacy.html:28
@@ -1936,15 +2051,15 @@ msgstr ""
 #: templates/privacy.html:30
 msgid "details on sharing data with third parties"
 msgstr ""
-"None of the data that is not openly shown on the forum by the choice of the user "
-"is shared with any third party."
+"None of the data that is not openly shown on the forum by the choice of the "
+"user is shared with any third party."
 
 #: templates/privacy.html:35
 msgid "cookie policy details"
 msgstr ""
-"Forum software relies on the internet cookie technology to "
-"keep track of user sessions. Cookies must be enabled "
-"in your browser so that forum can work for you."
+"Forum software relies on the internet cookie technology to keep track of "
+"user sessions. Cookies must be enabled in your browser so that forum can "
+"work for you."
 
 #: templates/privacy.html:37
 msgid "Policy Changes"
@@ -1953,9 +2068,9 @@ msgstr ""
 #: templates/privacy.html:38
 msgid "how privacy policies can be changed"
 msgstr ""
-"These policies may be adjusted to improve protection of "
-"user's privacy. Whenever such changes occur, users will be "
-"notified via the internal messaging system. "
+"These policies may be adjusted to improve protection of user's privacy. "
+"Whenever such changes occur, users will be notified via the internal "
+"messaging system. "
 
 #: templates/question.html:77 templates/question.html.py:78
 #: templates/question.html:94 templates/question.html.py:96
@@ -1981,31 +2096,31 @@ msgid "remove favorite mark from this question (click again to restore mark)"
 msgstr ""
 
 #: templates/question.html:140 templates/question.html.py:294
-#: templates/revisions_answer.html:56 templates/revisions_question.html:56
+#: templates/revisions_answer.html:58 templates/revisions_question.html:58
 msgid "edit"
 msgstr ""
 
-#: templates/question.html:144 templates/question.html.py:301
-msgid "delete"
-msgstr ""
-
-#: templates/question.html:149
+#: templates/question.html:145
 msgid "reopen"
 msgstr ""
 
-#: templates/question.html:153
+#: templates/question.html:149
 msgid "close"
 msgstr ""
 
-#: templates/question.html:159 templates/question.html.py:308
+#: templates/question.html:155 templates/question.html.py:299
 msgid ""
 "report as offensive (i.e containing spam, advertising, malicious text, etc.)"
 msgstr ""
 
-#: templates/question.html:160 templates/question.html.py:309
+#: templates/question.html:156 templates/question.html.py:300
 msgid "flag offensive"
 msgstr ""
 
+#: templates/question.html:164 templates/question.html.py:311
+msgid "delete"
+msgstr ""
+
 #: templates/question.html:182 templates/question.html.py:331
 msgid "delete this comment"
 msgstr ""
@@ -2115,7 +2230,7 @@ msgstr ""
 msgid "permanent link"
 msgstr "link"
 
-#: templates/question.html:301
+#: templates/question.html:311
 msgid "undelete"
 msgstr ""
 
@@ -2287,40 +2402,61 @@ msgstr ""
 msgid "tag editors receive special awards from the community"
 msgstr ""
 
-#: templates/questions.html:24
+#: templates/questions.html:29
 msgid "Found by tags"
 msgstr "Tagged questions"
 
-#: templates/questions.html:24
+#: templates/questions.html:33
+msgid "Search results"
+msgstr ""
+
+#: templates/questions.html:35
 msgid "Found by title"
 msgstr ""
 
-#: templates/questions.html:24
+#: templates/questions.html:39 templates/unanswered.html:8
+#: templates/unanswered.html.py:19
+msgid "Unanswered questions"
+msgstr ""
+
+#: templates/questions.html:41
 msgid "All questions"
 msgstr ""
 
-#: templates/questions.html:26 templates/unanswered.html:21
+#: templates/questions.html:47 templates/unanswered.html:21
 msgid "most recently asked questions"
 msgstr ""
 
-#: templates/questions.html:27
+#: templates/questions.html:48
 msgid "most recently updated questions"
 msgstr ""
 
-#: templates/questions.html:27
+#: templates/questions.html:48
 msgid "active"
 msgstr ""
 
-#: templates/questions.html:126
+#: templates/questions.html:144
+msgid "Did not find anything?"
+msgstr ""
+
+#: templates/questions.html:147
+msgid "Did not find what you were looking for?"
+msgstr ""
+
+#: templates/questions.html:149
+msgid "Please, post your question!"
+msgstr ""
+
+#: templates/questions.html:163
 #, python-format
 msgid ""
 "\n"
-"\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
-"\t\t\t"
+"            have total %(q_num)s questions tagged %(tagname)s\n"
+"            "
 msgid_plural ""
 "\n"
-"\t\t\thave total %(q_num)s questions tagged %(tagname)s\n"
-"\t\t\t"
+"            have total %(q_num)s questions tagged %(tagname)s\n"
+"            "
 msgstr[0] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>question tagged</p><p><span "
@@ -2330,16 +2466,41 @@ msgstr[1] ""
 "<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div "
 "class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>"
 
-#: templates/questions.html:133
+#: templates/questions.html:171
 #, python-format
 msgid ""
 "\n"
-"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t\t"
+"                    have total %(q_num)s questions containing %(searchtitle)"
+"s in full text\n"
+"                    "
 msgid_plural ""
 "\n"
-"\t\t\t\thave total %(q_num)s questions containing %(searchtitle)s\n"
-"\t\t\t\t"
+"                    have total %(q_num)s questions containing %(searchtitle)"
+"s in full text\n"
+"                    "
+msgstr[0] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>question "
+"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
+"p>"
+msgstr[1] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions "
+"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
+"p>"
+
+#: templates/questions.html:177
+#, python-format
+msgid ""
+"\n"
+"                    have total %(q_num)s questions containing %(searchtitle)"
+"s\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    have total %(q_num)s questions containing %(searchtitle)"
+"s\n"
+"                    "
 msgstr[0] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>question with title "
@@ -2351,55 +2512,80 @@ msgstr[1] ""
 "containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></"
 "p>"
 
-#: templates/questions.html:139
+#: templates/questions.html:185
+#, python-format
+msgid ""
+"\n"
+"                    have total %(q_num)s unanswered questions\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    have total %(q_num)s unanswered questions\n"
+"                    "
+msgstr[0] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>question without an "
+"accepted answer</p>"
+msgstr[1] ""
+"\n"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions without an "
+"accepted answer</p>"
+
+#: templates/questions.html:191
 #, python-format
 msgid ""
 "\n"
-"\t\t\t\thave total %(q_num)s questions\n"
-"\t\t\t\t"
+"                    have total %(q_num)s questions\n"
+"                    "
 msgid_plural ""
 "\n"
-"\t\t\t\thave total %(q_num)s questions\n"
-"\t\t\t\t"
+"                    have total %(q_num)s questions\n"
+"                    "
 msgstr[0] ""
 "\n"
 "<div class=\"questions-count\">%(q_num)s</div><p>question</p>"
 msgstr[1] ""
 "\n"
-"<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
+"<div class=\"questions-count\">%(q_num)s</div><p>questions<p>"
 
-#: templates/questions.html:148
+#: templates/questions.html:201
 msgid "latest questions info"
 msgstr "<strong>Newest</strong> questions are shown first."
 
-#: templates/questions.html:152
+#: templates/questions.html:205
 msgid "Questions are sorted by the <strong>time of last update</strong>."
 msgstr ""
 
-#: templates/questions.html:153
+#: templates/questions.html:206
 msgid "Most recently answered ones are shown first."
 msgstr "<strong>Most recently answered</strong> questions are shown first."
 
-#: templates/questions.html:157
+#: templates/questions.html:210
 msgid "Questions sorted by <strong>number of responses</strong>."
 msgstr "Questions sorted by the <strong>number of answers</strong>."
 
-#: templates/questions.html:158
+#: templates/questions.html:211
 msgid "Most answered questions are shown first."
 msgstr " "
 
-#: templates/questions.html:162
+#: templates/questions.html:215
 msgid "Questions are sorted by the <strong>number of votes</strong>."
 msgstr ""
 
-#: templates/questions.html:163
+#: templates/questions.html:216
 msgid "Most voted questions are shown first."
 msgstr ""
 
-#: templates/questions.html:168 templates/unanswered.html:118
+#: templates/questions.html:224 templates/unanswered.html:118
 msgid "Related tags"
 msgstr "Tags"
 
+#: templates/questions.html:227 templates/tag_selector.html:10
+#: templates/tag_selector.html.py:27
+#, python-format
+msgid "see questions tagged '%(tag_name)s'"
+msgstr ""
+
 #: templates/reopen.html:6 templates/reopen.html.py:16
 msgid "Reopen question"
 msgstr ""
@@ -2428,15 +2614,41 @@ msgstr ""
 msgid "Reopen this question"
 msgstr ""
 
-#: templates/revisions_answer.html:7 templates/revisions_answer.html.py:36
-#: templates/revisions_question.html:8 templates/revisions_question.html:36
+#: templates/revisions_answer.html:7 templates/revisions_answer.html.py:38
+#: templates/revisions_question.html:8 templates/revisions_question.html:38
 msgid "Revision history"
 msgstr ""
 
-#: templates/revisions_answer.html:48 templates/revisions_question.html:48
+#: templates/revisions_answer.html:50 templates/revisions_question.html:50
 msgid "click to hide/show revision"
 msgstr ""
 
+#: templates/tag_selector.html:4
+msgid "Interesting tags"
+msgstr ""
+
+#: templates/tag_selector.html:14
+#, python-format
+msgid "remove '%(tag_name)s' from the list of interesting tags"
+msgstr ""
+
+#: templates/tag_selector.html:20 templates/tag_selector.html.py:37
+msgid "Add"
+msgstr ""
+
+#: templates/tag_selector.html:21
+msgid "Ignored tags"
+msgstr ""
+
+#: templates/tag_selector.html:31
+#, python-format
+msgid "remove '%(tag_name)s' from the list of ignored tags"
+msgstr ""
+
+#: templates/tag_selector.html:40
+msgid "keep ingored questions hidden"
+msgstr ""
+
 #: templates/tags.html:6 templates/tags.html.py:30
 msgid "Tag list"
 msgstr ""
@@ -2469,10 +2681,6 @@ msgstr ""
 msgid "Nothing found"
 msgstr ""
 
-#: templates/unanswered.html:8 templates/unanswered.html.py:19
-msgid "Unanswered questions"
-msgstr ""
-
 #: templates/unanswered.html:114
 #, python-format
 msgid "have %(num_q)s unanswered questions"
@@ -2501,7 +2709,7 @@ msgstr "<a href='%(gravatar_faq_url)s'>gravatar</a>"
 msgid "Registered user"
 msgstr ""
 
-#: templates/user_edit.html:82 templates/user_email_subscriptions.html:17
+#: templates/user_edit.html:86 templates/user_email_subscriptions.html:20
 msgid "Update"
 msgstr ""
 
@@ -2518,7 +2726,7 @@ msgstr ""
 "receive emails - select 'no email' on all items below.<br/>Updates are only "
 "sent when there is any new activity on selected items."
 
-#: templates/user_email_subscriptions.html:18
+#: templates/user_email_subscriptions.html:21
 msgid "Stop sending email"
 msgstr "Stop Email"
 
@@ -2662,10 +2870,11 @@ msgstr[1] ""
 
 #: templates/user_stats.html:100
 #, python-format
-msgid "see other questions tagged '%(tag)s' "
+msgid ""
+"see other questions with %(view_user)s's contributions tagged '%(tag_name)s' "
 msgstr ""
 
-#: templates/user_stats.html:114
+#: templates/user_stats.html:115
 #, python-format
 msgid ""
 "\n"
@@ -2762,12 +2971,11 @@ msgstr ""
 msgid "here is why email is required, see %(gravatar_faq_url)s"
 msgstr ""
 "<span class='strong big'>Please enter your email address in the box below.</"
-"span> Valid email address is required on this Q&amp;"
-"A forum. If you like, you can <strong>receive updates</strong> on "
-"interesting questions or entire forum via email. Also, your email is used to "
-"create a unique <a href='%(gravatar_faq_url)s'><strong>gravatar</strong></a> "
-"image for your account. Email addresses are never shown or otherwise shared "
-"with anybody else."
+"span> Valid email address is required on this Q&amp;A forum. If you like, "
+"you can <strong>receive updates</strong> on interesting questions or entire "
+"forum via email. Also, your email is used to create a unique <a href='%"
+"(gravatar_faq_url)s'><strong>gravatar</strong></a> image for your account. "
+"Email addresses are never shown or otherwise shared with anybody else."
 
 #: templates/authopenid/changeemail.html:31
 msgid "Your new Email"
@@ -2795,8 +3003,8 @@ msgstr ""
 "<span class=\"strong big\">An email with a validation link has been sent to %"
 "(email)s.</span> Please <strong>follow the emailed link</strong> with your "
 "web browser. Email validation is necessary to help insure the proper use of "
-"email on <span class=\"orange\">Q&amp;A</span>. If you would like "
-"to use <strong>another email</strong>, please <a href='%(change_email_url)"
+"email on <span class=\"orange\">Q&amp;A</span>. If you would like to use "
+"<strong>another email</strong>, please <a href='%(change_email_url)"
 "s'><strong>change it again</strong></a>."
 
 #: templates/authopenid/changeemail.html:57
@@ -2917,14 +3125,13 @@ msgid ""
 "                        "
 msgstr ""
 "<p><span class='strong big'>Oops... looks like screen name %(username)s is "
-"already used in another account.</span></p><p>Please choose another screen name "
-"to use with your %(provider)s login. Also, a valid email address is "
-"required on the <span class='orange'>Q&amp;A</span> forum. Your "
-"email is used to create a unique <a href='%(gravatar_faq_url)"
-"s'><strong>gravatar</strong></a> image for your account. If you like, "
-"you can <strong>receive updates</strong> on the interesting questions or "
-"entire forum by email. Email addresses are never shown or otherwise shared "
-"with anybody else.</p>"
+"already used in another account.</span></p><p>Please choose another screen "
+"name to use with your %(provider)s login. Also, a valid email address is "
+"required on the <span class='orange'>Q&amp;A</span> forum. Your email is "
+"used to create a unique <a href='%(gravatar_faq_url)s'><strong>gravatar</"
+"strong></a> image for your account. If you like, you can <strong>receive "
+"updates</strong> on the interesting questions or entire forum by email. "
+"Email addresses are never shown or otherwise shared with anybody else.</p>"
 
 #: templates/authopenid/complete.html:35
 #, python-format
@@ -2962,32 +3169,36 @@ msgstr ""
 msgid "receive updates motivational blurb"
 msgstr ""
 "<strong>Receive forum updates by email</strong> - this will help our "
-"community grow and become more useful.<br/>By default "
-"<span class='orange'>Q&amp;A</span> forum sends up to <strong>one "
-"email digest per week</strong>  - only when there is anything new.<br/>If "
-"you like, please adjust this now or any time later from your user account."
+"community grow and become more useful.<br/>By default <span "
+"class='orange'>Q&amp;A</span> forum sends up to <strong>one email digest per "
+"week</strong>  - only when there is anything new.<br/>If you like, please "
+"adjust this now or any time later from your user account."
 
 #: templates/authopenid/complete.html:91
+msgid "Tag filter tool will be your right panel, once you log in."
+msgstr ""
+
+#: templates/authopenid/complete.html:92
 msgid "create account"
 msgstr "Signup"
 
-#: templates/authopenid/complete.html:100
+#: templates/authopenid/complete.html:101
 msgid "Existing account"
 msgstr ""
 
-#: templates/authopenid/complete.html:101
+#: templates/authopenid/complete.html:102
 msgid "user name"
 msgstr ""
 
-#: templates/authopenid/complete.html:102
+#: templates/authopenid/complete.html:103
 msgid "password"
 msgstr ""
 
-#: templates/authopenid/complete.html:107
+#: templates/authopenid/complete.html:108
 msgid "Register"
 msgstr ""
 
-#: templates/authopenid/complete.html:108 templates/authopenid/signin.html:140
+#: templates/authopenid/complete.html:109 templates/authopenid/signin.html:140
 msgid "Forgot your password?"
 msgstr ""
 
@@ -3080,6 +3291,10 @@ msgstr ""
 msgid "Traditional login information"
 msgstr ""
 
+#: templates/authopenid/external_legacy_login_info.html:12
+msgid "how to login with password through external login website"
+msgstr ""
+
 #: templates/authopenid/sendpw.html:4 templates/authopenid/sendpw.html.py:7
 msgid "Send new password"
 msgstr "Recover password"
@@ -3274,3 +3489,18 @@ msgstr ""
 #: templates/authopenid/signup.html:19
 msgid "return to OpenID login"
 msgstr ""
+
+#~ msgid ""
+#~ "\n"
+#~ "\t\t\t\thave total %(q_num)s questions\n"
+#~ "\t\t\t\t"
+#~ msgid_plural ""
+#~ "\n"
+#~ "\t\t\t\thave total %(q_num)s questions\n"
+#~ "\t\t\t\t"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "<div class=\"questions-count\">%(q_num)s</div><p>question</p>"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "<div class=\"questions-count\">%(q_num)s</div><p>questions</p>"
-- 
cgit v1.2.3-1-g7c22